Fix address matching in Return-Path header on identity selection (#1489374)

Aleksander Machniak

2013-10-15 c20fa4a1ad57a6fa013c7c9ddba72c6c3aafe345

 program/steps/settings/edit_folder.inc

@@ -17,9 +17,6 @@
 +-----------------------------------------------------------------------+
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+

 $Id$

*/

// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
@@ -81,7 +78,7 @@

    // Location (name)
    if ($options['protected']) {
        $foldername = Q(str_replace($delimiter, ' &raquo; ', rcmail_localize_folderpath($mbox_imap)));
        $foldername = str_replace($delimiter, ' &raquo; ', Q(rcmail_localize_folderpath($mbox_imap)));
    }
    else if ($options['norename']) {
        $foldername = Q($folder);
@@ -267,9 +264,12 @@
            $content = rcmail_get_form_part($tab, $attrib);
        }

        if ($content) {
        if ($content && sizeof($form) > 1) {
            $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
        }
        else {
            $out .= $content ."\n";
        }
    }

    $out .= "\n$form_end";