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/config.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/config.php')
| -rw-r--r-- | phpBB/includes/db/migration/tool/config.php | 4 |
1 files changed, 2 insertions, 2 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); |