diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-27 14:09:27 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-27 14:09:27 -0600 |
| commit | c3434dec4020e1053f40382cdec729316f901728 (patch) | |
| tree | 7379391ff6162c870ab620822b02ad94bb17b13c /phpBB/includes | |
| parent | d296e809d5e44eec0005ed8229d5a173cd4f6edb (diff) | |
| download | forums-c3434dec4020e1053f40382cdec729316f901728.tar forums-c3434dec4020e1053f40382cdec729316f901728.tar.gz forums-c3434dec4020e1053f40382cdec729316f901728.tar.bz2 forums-c3434dec4020e1053f40382cdec729316f901728.tar.xz forums-c3434dec4020e1053f40382cdec729316f901728.zip | |
[ticket/11363] Fix a couple bugs and throw errors if the file not found
PHPBB3-11363
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/migration/tool/module.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php index 994768598c..8744866a16 100644 --- a/phpBB/includes/db/migration/tool/module.php +++ b/phpBB/includes/db/migration/tool/module.php @@ -189,8 +189,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac } $acp_modules = new acp_modules(); $module = $acp_modules->get_module_infos($basename, $class); + $module = $module[$basename]; unset($acp_modules); + if (empty($module)) + { + throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename); + } + $result = ''; foreach ($module['modes'] as $mode => $module_info) { @@ -367,8 +373,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac } $acp_modules = new acp_modules(); $module_info = $acp_modules->get_module_infos($basename, $class); + $module_info = $module_info[$basename]; unset($acp_modules); + if (empty($module_info)) + { + throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename); + } + foreach ($module_info['modes'] as $mode => $info) { if (!isset($module['modes']) || in_array($mode, $module['modes'])) |