diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
| commit | 458b9b50ec8d835b4c5f72823d4815a9cee6d706 (patch) | |
| tree | ab0ea84c5e34cb6b5fa61b736e89722a92395c16 /phpBB/common.php | |
| parent | b2721cca0c82400efbf23abca1cbe260d4ea0eea (diff) | |
| download | forums-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/common.php')
| -rw-r--r-- | phpBB/common.php | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 6c4da7da4a..f56569f8e1 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -80,7 +80,6 @@ define('GROUP_SPECIAL', 3); define('ITEM_UNLOCKED', 0); define('ITEM_LOCKED', 1); define('ITEM_MOVED', 2); -define('ITEM_CATEGORY', 3); // Topic types define('POST_NORMAL', 0); @@ -183,7 +182,7 @@ if ( empty($acl_options) ) } */ -if (!$config = $cache->load('config')) +if (!$config = $cache->get('config')) { $config = array(); @@ -195,7 +194,18 @@ if (!$config = $cache->load('config')) $config[$row['config_name']] = $row['config_value']; } - $cache->save('config', $config); + $cache->put('config', $config); +} + +if ($cache->exists('acl_options')) +{ + $acl_options = $cache->get('acl_options'); +} +else +{ + require_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); + $auth_admin = new auth_admin(); + $acl_options = $auth_admin->acl_cache_options(); } /* |