From 4612535008a870e0970b9dc645b93e269ac2ed40 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Aug 2010 06:25:30 +0000
Subject: - Revert last (unintentional) commit

---
 program/steps/settings/delete_identity.inc | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'program/steps/settings/delete_identity.inc')

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();
-- 
cgit v1.2.3