aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-12-30 11:46:51 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2013-12-30 11:50:37 -0600
commit05cf83aca7a8f3ddacff932419508a65cfe48455 (patch)
treec30a9b03b08ef7bca5921af21643049c9e605db2 /phpBB
parent7740ab5dc35734177e64bed3a21a94ab11d5d0aa (diff)
downloadforums-05cf83aca7a8f3ddacff932419508a65cfe48455.tar
forums-05cf83aca7a8f3ddacff932419508a65cfe48455.tar.gz
forums-05cf83aca7a8f3ddacff932419508a65cfe48455.tar.bz2
forums-05cf83aca7a8f3ddacff932419508a65cfe48455.tar.xz
forums-05cf83aca7a8f3ddacff932419508a65cfe48455.zip
[ticket/12006] Add extension enabled check token to module auth
PHPBB3-12006
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_module.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index a8855a3be2..ea3b3356bb 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -334,7 +334,7 @@ class p_master
static function module_auth($module_auth, $forum_id)
{
global $auth, $config;
- global $request;
+ global $request, $phpbb_extension_manager;
$module_auth = trim($module_auth);
@@ -358,6 +358,7 @@ class p_master
'aclf_([a-z0-9_]+)' => '(int) $auth->acl_getf_global(\'\\1\')',
'cfg_([a-z0-9_]+)' => '(int) $config[\'\\1\']',
'request_([a-zA-Z0-9_]+)' => '$request->variable(\'\\1\', false)',
+ 'ext_([a-zA-Z0-9_/]+)' => 'array_key_exists(\'\\1\', $phpbb_extension_manager->all_enabled())',
);
$tokens = $match[0];