Changeset 7e0ec7e in github

Timestamp:

Dec 1, 2006 12:49:06 PM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

740e9ec

Parents:

0a020ca

Message:

Fixed folder name encoding in subscription list (Bug #1484113)

File:

• program/steps/settings/manage_folders.inc (modified) (2 diffs)

program/steps/settings/manage_folders.inc

@@ -166 +166 @@
     $protected = ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']));
     $zebra_class = $i%2 ? 'even' : 'odd';
-    if (in_array($folder, $CONFIG['default_imap_folders']))
-      $folder = rcube_label(strtolower($folder));
     $folder_js = rep_specialchars_output($folder, 'js');
     $folder_js_enc = rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7'), 'js');
+    $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcube_label(strtolower($folder)) : rcube_charset_convert($folder, 'UTF-7');
     
     if (!$protected)
@@ -177 +176 @@
                     $i+1,
                     $zebra_class,
-                    rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7'), 'html', 'all'));
+                    rep_specialchars_output($folder_html, 'html', 'all'));
                     
     if ($protected)