mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[feature/extension-manager] Always store the full class name as module basename

Browse Source 
The updater swaps out all basenames.

PHPBB3-10323
This commit is contained in:
Nils Adermann
2011-08-29 20:54:42 -04:00
parent c785ef7aa7
commit fe4b8818ec
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions_module.php
View File

@@ -441,18 +441,19 @@ class p_master
}
// new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board
if (!class_exists($this->p_name) && !class_exists("{$this->p_class}_$this->p_name"))
if (!class_exists($this->p_name))
{
if (!file_exists("$module_path/{$this->p_class}_$this->p_name.$phpEx"))
if (!file_exists("$module_path/{$this->p_name}.$phpEx"))
{
trigger_error("Cannot find module $module_path/{$this->p_class}_$this->p_name.$phpEx", E_USER_ERROR);
trigger_error("Cannot find module $module_path/{$this->p_name}.$phpEx", E_USER_ERROR);
}
include("$module_path/{$this->p_class}_$this->p_name.$phpEx");
include("$module_path/{$this->p_name}.$phpEx");
if (!class_exists("{$this->p_class}_$this->p_name"))
if (!class_exists($this->p_name))
{
trigger_error("Module file $module_path/{$this->p_class}_$this->p_name.$phpEx does not contain correct class [{$this->p_class}_$this->p_name]", E_USER_ERROR);
trigger_error("Module file $module_path/{$this->p_name}.$phpEx does not contain correct class [{$this->p_name}]", E_USER_ERROR);
}
}
@@ -462,7 +463,7 @@ class p_master
}
// Create a new instance of the desired module ...
$class_name = (class_exists($this->p_name)) ? $this->p_name : "{$this->p_class}_$this->p_name";
$class_name = $this->p_name;
$this->module = new $class_name($this);