From c58c3bf554d08f5010f635e3b2d95edae5281bf2 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sat, 18 Oct 2008 10:56:11 +0000
Subject: - Fix html signature formatting when identity save error occured
 (#1485426)

git-svn-id: https://svn.roundcube.net/trunk@1987 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc                 | 3 ++-
 roundcubemail/program/steps/settings/save_identity.inc | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 9223e26f8..75ad2b30b 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -550,7 +550,8 @@ function rcmail_get_edit_field($col, $value, $attrib, $type='text')
 
   // use value from post
   if (!empty($_POST[$fname]))
-    $value = get_input_value($fname, RCUBE_INPUT_POST);
+    $value = get_input_value($fname, RCUBE_INPUT_POST,
+	    $type == 'textarea' && strpos($attrib['class'], 'mce_editor')!==false ? true : false);
 
   $out = $input->show($value);
          
diff --git a/roundcubemail/program/steps/settings/save_identity.inc b/roundcubemail/program/steps/settings/save_identity.inc
index de2b4fc19..e19a3317b 100644
--- a/roundcubemail/program/steps/settings/save_identity.inc
+++ b/roundcubemail/program/steps/settings/save_identity.inc
@@ -28,7 +28,7 @@ $updated = $default_id = false;
 if (empty($_POST['_name']) || empty($_POST['_email']))
   {
   $OUTPUT->show_message('formincomplete', 'warning');
-  rcmail_overwrite_action('edit-identitiy');
+  rcmail_overwrite_action('edit-identity');
   return;
   }
 
@@ -71,7 +71,7 @@ if ($_POST['_iid'])
   {
     // show error message
     $OUTPUT->show_message('errorsaving', 'error');
-    rcmail_overwrite_action('edit-identitiy');
+    rcmail_overwrite_action('edit-identity');
     return;
   }
 }
-- 
cgit v1.2.3