diff options
| author | alecpl <alec@alec.pl> | 2011-06-02 12:36:32 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-06-02 12:36:32 +0000 |
| commit | 187833dff94146a9b176a1ca4a5c9996809fd4a7 (patch) | |
| tree | 8018d76e44be79286d116d0588b7bec0298f5432 /program/steps | |
| parent | fcbf7a12fff1a3cd8bbace46d9b61e4ce5b6a7ce (diff) | |
- Apply fixes from trunk
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/save_identity.inc | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 5160027f2..d738322b7 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -575,7 +575,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) '', '<html>', ); - $html = preg_replace($html_search, $html_replace, $html); + $html = preg_replace($html_search, $html_replace, trim($html)); // PCRE errors handling (#1486856), should we use something like for every preg_* use? if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) { diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index c8d258fd7..dbb4d4738 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -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'])) |