Browse Source

use_special_folder_color conf.pl setting works again, closes #931956.
This is definately something that should be done in a stylesheet, not like this.

Thijs Kinkhorst 21 years ago
parent
commit
4b33889ad3
2 changed files with 6 additions and 5 deletions
  1. 2 1
      ChangeLog
  2. 4 4
      src/left_main.php

+ 2 - 1
ChangeLog

@@ -51,7 +51,8 @@ Version 1.5.1 -- CVS
     of long format. (only occures in the timeframe around 0:00 AM till
     timezone).
   - Added address book sorting options. Ascending/descending sorting code 
-    written by Bryan Loniewski 
+    written by Bryan Loniewski.
+  - Use Special Folder Color config option works again (#931956).
 
 Version 1.5.0
 --------------------

+ 4 - 4
src/left_main.php

@@ -298,7 +298,7 @@ function is_parent_box($curbox_name, $parbox_name) {
 function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
            $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, 
-           $use_icons, $icon_theme;
+           $use_icons, $icon_theme, $use_special_folder_color;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -421,7 +421,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
     $font = '';
     $fontend = '';
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }
@@ -447,7 +447,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders;
+           $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -502,7 +502,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }