diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-09 00:42:28 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-02-09 00:42:28 +0100 |
| commit | 6582a84379d658f9dddbdb2705ea6bce74685c85 (patch) | |
| tree | 8e1460119ac9bd9256ef900d622c73d0fe9a62ff | |
| parent | d4e00b6c0dd75c757797a0fc8bc30e9b8672e094 (diff) | |
| parent | ad8ab099301c283b3606459dc9a84f08793f42e5 (diff) | |
| download | forums-6582a84379d658f9dddbdb2705ea6bce74685c85.tar forums-6582a84379d658f9dddbdb2705ea6bce74685c85.tar.gz forums-6582a84379d658f9dddbdb2705ea6bce74685c85.tar.bz2 forums-6582a84379d658f9dddbdb2705ea6bce74685c85.tar.xz forums-6582a84379d658f9dddbdb2705ea6bce74685c85.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10634' into develop
* cyberalien/ticket/10634:
[ticket/10634] Specify module type when viewing profile
[ticket/10634] Changing p_master::is_full_class
| -rw-r--r-- | phpBB/includes/functions_module.php | 2 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index b7bb770031..db7defdc48 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -923,6 +923,6 @@ class p_master */ protected function is_full_class($basename) { - return (substr($basename, 0, 6) === 'phpbb_' || substr($basename, 0, strlen($this->p_class) + 1) === $this->p_class . '_'); + return (preg_match('/^(phpbb|ucp|mcp|acp)_/', $basename)); } } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 1201aceff9..cf2cb5b06d 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -571,11 +571,11 @@ switch ($mode) $module->list_modules('ucp'); $module->list_modules('mcp'); - $user_notes_enabled = ($module->loaded('notes', 'user_notes')) ? true : false; - $warn_user_enabled = ($module->loaded('warn', 'warn_user')) ? true : false; - $zebra_enabled = ($module->loaded('zebra')) ? true : false; - $friends_enabled = ($module->loaded('zebra', 'friends')) ? true : false; - $foes_enabled = ($module->loaded('zebra', 'foes')) ? true : false; + $user_notes_enabled = ($module->loaded('mcp_notes', 'user_notes')) ? true : false; + $warn_user_enabled = ($module->loaded('mcp_warn', 'warn_user')) ? true : false; + $zebra_enabled = ($module->loaded('ucp_zebra')) ? true : false; + $friends_enabled = ($module->loaded('ucp_zebra', 'friends')) ? true : false; + $foes_enabled = ($module->loaded('ucp_zebra', 'foes')) ? true : false; unset($module); } |