summaryrefslogtreecommitdiff
path: root/program/steps/settings/delete_identity.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-08-13 06:25:30 +0000
committeralecpl <alec@alec.pl>2010-08-13 06:25:30 +0000
commit4612535008a870e0970b9dc645b93e269ac2ed40 (patch)
treedcc5eff97b179b00c27aaee7810e753cd4055324 /program/steps/settings/delete_identity.inc
parentb72a1001dc8e4fa7a2245cde4a0556f405eccbc9 (diff)
- Revert last (unintentional) commit
Diffstat (limited to 'program/steps/settings/delete_identity.inc')
-rw-r--r--program/steps/settings/delete_identity.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 42c1da61f..06bcab906 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/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();