From 2d5beeaf06e92dd98adcb7c2661be93087542b46 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 02 Jun 2011 08:26:59 -0400
Subject: [PATCH] - Don't call rcube_idn_to_ascii() on empty data
---
program/steps/settings/save_identity.inc | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index b2957a7..f493f73 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -116,9 +116,12 @@
$plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data));
$save_data = $plugin['record'];
- $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
- $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']);
- $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);
+ if ($save_data['email'])
+ $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
+ if ($save_data['bcc'])
+ $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']);
+ if ($save_data['reply-to'])
+ $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);
if (!$plugin['abort'])
$insert_id = $save_data['email'] ? $USER->insert_identity($save_data) : null;
@@ -127,7 +130,7 @@
if ($insert_id) {
$OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
-
+
$_GET['_iid'] = $insert_id;
if (!empty($_POST['_standard']))
--
Gitblit v1.9.1