From 7f59c01a4594a03be81d266032d967a302cc6a85 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 03 Nov 2008 07:16:15 -0500
Subject: [PATCH] #1485511: better handling for editing non-existing identities
---
program/steps/settings/edit_identity.inc | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 78b2045..c8d448a 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -27,6 +27,12 @@
if (is_array($IDENTITY_RECORD))
$OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
+ else {
+ $OUTPUT->show_message('opnotpermitted', 'error');
+ // go to identities page
+ rcmail_overwrite_action('identities');
+ return;
+ }
}
// add-identity
else {
@@ -64,9 +70,6 @@
"theme_advanced_buttons2 : ',fontselect,fontsizeselect'," .
"theme_advanced_buttons3 : '',".
"gecko_spellcheck : true });");
-
- if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
- return rcube_label('notfound');
// add some labels to client
$OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting');
--
Gitblit v1.9.1