Imported Upstream version 0.5.3+dfsg

[roundcube.git] / program / steps / settings / save_identity.inc

diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index b576970f5f62749a689e722f7b57016ec242065b..d6be9ccacb65e51ba2f34b06be50d4b35ba3da32 100644 (file)
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: save_identity.inc 4509 2011-02-09 10:51:50Z thomasb $
+ $Id: save_identity.inc 4830 2011-06-02 12:36:32Z alec $
 
 */
 
@@ -116,9 +116,12 @@ else if (IDENTITIES_LEVEL < 2)
   $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 @@ else if (IDENTITIES_LEVEL < 2)
 
   if ($insert_id) {
     $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
-    
+
     $_GET['_iid'] = $insert_id;
 
     if (!empty($_POST['_standard']))