[feature/extension-manager] Avoid unecessary loading of acp classes

PHPBB3-10323
This commit is contained in:
Nils Adermann 2011-08-22 03:39:07 -04:00
parent ade496e0f7
commit d5a5cdd0d7

View file

@ -554,11 +554,13 @@ class acp_modules
foreach ($modules as $module)
{
$info_class = preg_replace('/_module$/', '_info', $module);
// If the class does not exist it might be following the old
// format. phpbb_acp_info_acp_foo needs to be turned into
// acp_foo_info and the respective file has to be included
// manually because it does not support auto loading
if (!class_exists($module))
if (!class_exists($info_class))
{
$info_class = str_replace("phpbb_{$module_class}_info_", '', $module) . '_info';
if (file_exists($directory . $info_class . '.' . $phpEx))
@ -566,10 +568,6 @@ class acp_modules
include($directory . $info_class . '.' . $phpEx);
}
}
else
{
$info_class = preg_replace('/_module$/', '_info', $module);
}
if (class_exists($info_class))
{
@ -586,7 +584,9 @@ class acp_modules
}
else
{
if (!class_exists($module))
$info_class = preg_replace('/_module$/', '_info', $module);
if (!class_exists($info_class))
{
if (file_exists($directory . $module . '.' . $phpEx))
{
@ -594,10 +594,6 @@ class acp_modules
}
$info_class = $module . '_info';
}
else
{
$info_class = preg_replace('/_module$/', '_info', $module);
}
// Get module title tag
if (class_exists($info_class))