Fixed problem with changing templates using the tempalte's icon theme.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10827 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/options/display.php b/include/options/display.php
index 60a500c986ea3e269f3dc66c69d857ca90cbd763..af554d7e8551286da1f3b775af2ecea1db9192f5 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -224,11 +224,15 @@ function load_optpage_data_display() {
     /* Icon theme selection */
     if ($use_icons) {
         global $icon_themes, $icon_theme;
+        
         $temp = array();
         for ($count = 0; $count < sizeof($icon_themes); $count++) {
             $temp[$count] = $icon_themes[$count]['NAME'];
-            if ($icon_theme == $icon_themes[$count]['PATH'])
+            if ($icon_theme == $icon_themes[$count]['PATH'] ||
+                (($icon_theme == $sTplDir.'images/') && ($icon_themes[$count]['PATH']=='template'))
+               ) {
                 $value = $count;
+            }
         }
         if (sizeof($icon_themes) > 0) {
             $optvals[SMOPT_GRP_GENERAL][] = array(