diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-03 20:25:31 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 14:06:52 -0600 |
| commit | 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f (patch) | |
| tree | 89b5316ec07c5feb47ede6bf9ccfeb30b31f7f55 | |
| parent | bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff) | |
| download | forums-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar forums-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar.gz forums-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar.bz2 forums-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar.xz forums-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.zip | |
[ticket/11394] Relax Migration Tools
Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).
PHPBB3-11394
| -rw-r--r-- | phpBB/includes/db/migration/tool/config.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/db/migration/tool/module.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/db/migration/tool/permission.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/migrator.php | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php index 458a25fb66..0b626bf455 100644 --- a/phpBB/includes/db/migration/tool/config.php +++ b/phpBB/includes/db/migration/tool/config.php @@ -49,7 +49,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac { if (isset($this->config[$config_name])) { - throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXIST', $config_name); + return; } $this->config->set($config_name, $config_value, !$is_dynamic); @@ -105,7 +105,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac { if (!isset($this->config[$config_name])) { - throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name); + return; } $this->config->delete($config_name); 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; } } diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php index 4231fbe1dd..3b196fdbc2 100644 --- a/phpBB/includes/db/migration/tool/permission.php +++ b/phpBB/includes/db/migration/tool/permission.php @@ -107,7 +107,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte { if ($this->exists($auth_option, $global)) { - throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXIST', $auth_option); + return; } // We've added permissions, so set to true to notify the user. @@ -190,7 +190,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte { if (!$this->exists($auth_option, $global)) { - throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option); + return; } if ($global) @@ -315,7 +315,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte if (!$role_id) { - throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name); + return; } $sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index 84074c391c..59e6f06884 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -35,7 +35,6 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'CONFIG_ALREADY_EXIST' => 'The config setting "%s" unexpectedly already exists.', 'CONFIG_NOT_EXIST' => 'The config setting "%s" unexpectedly does not exist.', 'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.', @@ -43,13 +42,10 @@ $lang = array_merge($lang, array( 'MIGRATION_EXCEPTION_ERROR' => 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.', 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', - 'MODULE_ALREADY_EXIST' => 'The module "%s" unexpectedly already exists.', 'MODULE_ERROR' => 'An error occured while creating a module: %s', 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', 'MODULE_NOT_EXIST' => 'A required module does not exist: %s', - 'MODULE_NOT_REMOVABLE' => 'Module %1$s was unable to be removed: %2$s', - 'PERMISSION_ALREADY_EXIST' => 'The permission setting "%s" unexpectedly already exists.', 'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.', 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', |