aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm/acm_main.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-13 21:06:29 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-13 21:06:29 +0000
commit1aac08acc0df55fb5c323d91ae9c1f3d8c29535d (patch)
treefd54bd12b4deb05526fe49559cc0e6c07b497ac5 /phpBB/includes/acm/acm_main.php
parentb0b796381741cef142d5f76c2571e081c90a1ed3 (diff)
downloadforums-1aac08acc0df55fb5c323d91ae9c1f3d8c29535d.tar
forums-1aac08acc0df55fb5c323d91ae9c1f3d8c29535d.tar.gz
forums-1aac08acc0df55fb5c323d91ae9c1f3d8c29535d.tar.bz2
forums-1aac08acc0df55fb5c323d91ae9c1f3d8c29535d.tar.xz
forums-1aac08acc0df55fb5c323d91ae9c1f3d8c29535d.zip
make sure custom profile fields are created correctly on registration (#2225)
git-svn-id: file:///svn/phpbb/trunk@6058 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm/acm_main.php')
-rw-r--r--phpBB/includes/acm/acm_main.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php
index b4a2669a22..a3a251d194 100644
--- a/phpBB/includes/acm/acm_main.php
+++ b/phpBB/includes/acm/acm_main.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
}
/**
-* @package acm
* Class for grabbing/handling cached entries, extends acm_file or acm_db depending on the setup
+* @package acm
*/
class cache extends acm
{
@@ -238,7 +238,7 @@ class cache extends acm
{
$allowed = ($forum_id === 0) ? false : true;
}
-
+
if ($allowed)
{
$return['_allowed_'][$extension] = 0;
@@ -282,7 +282,7 @@ class cache extends acm
WHERE bot_active = 1
ORDER BY STRLEN(bot_agent) DESC';
break;
-
+
// LENGTH supported by MySQL, IBM DB2 and Oracle for sure...
default:
$sql = 'SELECT user_id, bot_agent, bot_ip
@@ -292,7 +292,7 @@ class cache extends acm
break;
}
$result = $db->sql_query($sql);
-
+
$bots = array();
while ($row = $db->sql_fetchrow($result))
{
@@ -330,7 +330,7 @@ class cache extends acm
$reparse = false;
$filename = $phpbb_root_path . 'styles/' . $theme[$key . '_path'] . '/' . $key . '/' . $key . '.cfg';
-
+
if (!file_exists($filename))
{
continue;
@@ -340,7 +340,7 @@ class cache extends acm
{
$reparse = true;
}
-
+
// Re-parse cfg file
if ($reparse)
{