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/permission.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/permission.php')
| -rw-r--r-- | phpBB/includes/db/migration/tool/permission.php | 6 |
1 files changed, 3 insertions, 3 deletions
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 . ' |