aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-28 23:30:09 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-28 23:30:09 +0000
commit19aed179e53f9660a7202e2e50816e1cef0f7be9 (patch)
treee2707fd68720f206c88f8bcaff6e2fc3173c9c94 /phpBB/includes/functions_module.php
parent4ded6cf5eef0892f9ef1d7351664e1d78445c419 (diff)
downloadforums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar
forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.gz
forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.bz2
forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.xz
forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.zip
$config to phpbb::$config
git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 6a7301c798..9206febca6 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -78,7 +78,7 @@ class p_master
*/
function list_modules($p_class)
{
- global $auth, $db, $user, $config;
+ global $auth, $db, $user;
// Sanitise for future path use, it's escaped as appropriate for queries
$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
@@ -310,7 +310,7 @@ class p_master
*/
function module_auth($module_auth, $forum_id = false)
{
- global $auth, $config;
+ global $auth;
$module_auth = trim($module_auth);
@@ -358,7 +358,7 @@ class p_master
$forum_id = ($forum_id === false) ? $this->acl_forum_id : $forum_id;
$is_auth = false;
- eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z0-9_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z0-9_]+)#', '#cfg_([a-z0-9_]+)#', '#request_([a-zA-Z0-9_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) $config[\'\\1\']', 'phpbb_request::variable(\'\\1\', false)'), $module_auth) . ');');
+ eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z0-9_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z0-9_]+)#', '#cfg_([a-z0-9_]+)#', '#request_([a-zA-Z0-9_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) phpbb::$config[\'\\1\']', 'phpbb_request::variable(\'\\1\', false)'), $module_auth) . ');');
return $is_auth;
}