summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-18 10:56:11 +0000
committeralecpl <alec@alec.pl>2008-10-18 10:56:11 +0000
commit407dcf9e7136341acfbb7573070360885cce31a8 (patch)
treedd0e67bbc8636028f491cc048c9f5cfe1304c6c4
parentbfdbcf52100c707e1aee3993e7fe6216a73e85f2 (diff)
- Fix html signature formatting when identity save error occured (#1485426)
-rw-r--r--CHANGELOG5
-rw-r--r--program/include/main.inc3
-rw-r--r--program/steps/settings/save_identity.inc4
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8de421b71..b54a29701 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/10/18 (alec)
+----------
+- Fix html2text class autoloading on Windows (#1485505)
+- Fix html signature formatting when identity save error occured (#1485426)
+
2008/10/15 (alec)
----------
- Add feedback and set busy when moving folder (#1485497)
diff --git a/program/include/main.inc b/program/include/main.inc
index 9223e26f8..75ad2b30b 100644
--- a/program/include/main.inc
+++ b/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/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index de2b4fc19..e19a3317b 100644
--- a/program/steps/settings/save_identity.inc
+++ b/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;
}
}