diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-19 15:31:30 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-19 15:31:30 -0700 |
| commit | e60816eeb12e70be88467d708685ffa49f177691 (patch) | |
| tree | f17e90b84d0681952ab28223c187b6cd8d49f9b3 /phpBB | |
| parent | 29322e85ff31d1a71a07846241dd809972323340 (diff) | |
| parent | f421c082f73b26f5578d14af7cdbfefd013f554a (diff) | |
| download | forums-e60816eeb12e70be88467d708685ffa49f177691.tar forums-e60816eeb12e70be88467d708685ffa49f177691.tar.gz forums-e60816eeb12e70be88467d708685ffa49f177691.tar.bz2 forums-e60816eeb12e70be88467d708685ffa49f177691.tar.xz forums-e60816eeb12e70be88467d708685ffa49f177691.zip | |
Merge pull request #1584 from marc1706/ticket/11713
[ticket/11713] Do not remove module if it couldn't be deleted
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/ajax.js | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 6f21dfa6ac..efb0639f1b 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -127,8 +127,10 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) { * The removes the parent row of the link or form that triggered the callback, * and is good for stuff like the removal of forums. */ -phpbb.addAjaxCallback('row_delete', function() { - $(this).parents('tr').remove(); +phpbb.addAjaxCallback('row_delete', function(res) { + if (res.SUCCESS !== false) { + $(this).parents('tr').remove(); + } }); diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index a1e681b29c..7a1d30196d 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -379,6 +379,7 @@ class acp_modules $json_response->send(array( 'MESSAGE_TITLE' => $user->lang('ERROR'), 'MESSAGE_TEXT' => implode('<br />', $errors), + 'SUCCESS' => false, )); } |