diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-13 06:25:30 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-13 06:25:30 +0000 |
| commit | b5abab330f033d1a0c32b1a8c361b65afc1dd21b (patch) | |
| tree | 4a51a36dbf33320d365033506a12c84d7c102edb /roundcubemail/program/steps/settings/delete_identity.inc | |
| parent | 383001f055b670aa19b4de0d64e4518c42a7c06c (diff) | |
- Revert last (unintentional) commit
git-svn-id: https://svn.roundcube.net/trunk@3896 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/settings/delete_identity.inc')
| -rw-r--r-- | roundcubemail/program/steps/settings/delete_identity.inc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/roundcubemail/program/steps/settings/delete_identity.inc b/roundcubemail/program/steps/settings/delete_identity.inc index 42c1da61f..06bcab906 100644 --- a/roundcubemail/program/steps/settings/delete_identity.inc +++ b/roundcubemail/program/steps/settings/delete_identity.inc @@ -31,16 +31,13 @@ if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) { if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid)) { $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid)); - - if (!$plugin['abort']) { - if ($USER->delete_identity($iid)) { - $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); - } - else { - $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); - } + + if (!$plugin['abort'] && $USER->delete_identity($iid)) { + $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); + } + else { + $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); } - // send response if ($OUTPUT->ajax_call) $OUTPUT->send(); |
