diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 15:10:48 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 15:10:48 -0500 |
| commit | 1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (patch) | |
| tree | ae2491873f7861df3cba196af5a083f76999dca7 /phpBB/includes/db/migration/tool/module.php | |
| parent | e652c078e694082a6cec76cc998bea346e66f02b (diff) | |
| parent | 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f (diff) | |
| download | forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.gz forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.bz2 forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.xz forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11394' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11394:
[ticket/11394] Relax Migration Tools
Diffstat (limited to 'phpBB/includes/db/migration/tool/module.php')
| -rw-r--r-- | phpBB/includes/db/migration/tool/module.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php index ad94c5aadb..ec683d36af 100644 --- a/phpBB/includes/db/migration/tool/module.php +++ b/phpBB/includes/db/migration/tool/module.php @@ -236,7 +236,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac if ($this->exists($class, $parent, $data['module_langname'])) { - throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']); + return; } if (!class_exists('acp_modules')) @@ -369,7 +369,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac { if (!$this->exists($class, $parent, $module)) { - throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module)); + return; } $parent_sql = ''; @@ -442,7 +442,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac $result = $acp_modules->delete_module($module_id); if (!empty($result)) { - throw new phpbb_db_migration_exception('MODULE_NOT_REMOVABLE', $module_id, $result); + return; } } |