makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'cyberalien/ticket/10634' into develop

Browse source 
* cyberalien/ticket/10634:
  [ticket/10634] Specify module type when viewing profile
  [ticket/10634] Changing p_master::is_full_class
This commit is contained in:
Igor Wiedler 2012-02-09 00:42:28 +01:00
commit 6582a84379
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_module.php
View file

@ -923,6 +923,6 @@ class p_master
*/ */
protected function is_full_class($basename) 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));
} }
} }

10
phpBB/memberlist.php
View file

@ -571,11 +571,11 @@ switch ($mode)
$module->list_modules('ucp'); $module->list_modules('ucp');
$module->list_modules('mcp'); $module->list_modules('mcp');
$user_notes_enabled = ($module->loaded('notes', 'user_notes')) ? true : false; $user_notes_enabled = ($module->loaded('mcp_notes', 'user_notes')) ? true : false;
$warn_user_enabled = ($module->loaded('warn', 'warn_user')) ? true : false; $warn_user_enabled = ($module->loaded('mcp_warn', 'warn_user')) ? true : false;
$zebra_enabled = ($module->loaded('zebra')) ? true : false; $zebra_enabled = ($module->loaded('ucp_zebra')) ? true : false;
$friends_enabled = ($module->loaded('zebra', 'friends')) ? true : false; $friends_enabled = ($module->loaded('ucp_zebra', 'friends')) ? true : false;
$foes_enabled = ($module->loaded('zebra', 'foes')) ? true : false; $foes_enabled = ($module->loaded('ucp_zebra', 'foes')) ? true : false;
unset($module); unset($module);
} }