aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-20 05:12:38 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-20 05:12:38 +0000
commit458b9b50ec8d835b4c5f72823d4815a9cee6d706 (patch)
treeab0ea84c5e34cb6b5fa61b736e89722a92395c16 /phpBB/includes/functions_admin.php
parentb2721cca0c82400efbf23abca1cbe260d4ea0eea (diff)
downloadforums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar
forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.gz
forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.bz2
forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.xz
forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.zip
Un-b0rked ACL options caching, small general fixes
git-svn-id: file:///svn/phpbb/trunk@3338 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index c2136d4671..e6b84cc67c 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -807,7 +807,7 @@ class auth_admin extends auth
function acl_cache_options($options = false)
{
- global $db;
+ global $db, $cache;
$options = array();
@@ -833,6 +833,7 @@ class auth_admin extends auth
$db->sql_freeresult($result);
}
+/*
// Re-cache options
$cache_str = "\$acl_options = array(\n";
foreach ($options as $type => $options_ary)
@@ -848,6 +849,9 @@ class auth_admin extends auth
config_cache_write('\$acl_options = array\(.*?\);', $cache_str);
$this->acl_clear_prefetch();
+*/
+ $cache->put('acl_options', $options);
+ $this->acl_clear_prefetch();
return $options;
}