need to encode & in strings

[squirrelmail.git] / include / options / display.php

diff --git a/include/options/display.php b/include/options/display.php
index 573f2ba4f6af2a4d5b61d50c65883c452afa1898..f7dfc0223725ec3064f04599853d8d4043f4c0c3 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -128,10 +128,15 @@ function load_optpage_data_display() {
     */
 
     $fontset_values = array();
-    foreach (array_keys($fontsets) as $fontset_key) {
-        $fontset_list[$fontset_key]=$fontset_key;
+    $fontset_list = array();
+
+    if (!empty($fontsets) && is_array($fontsets)) {
+
+        foreach (array_keys($fontsets) as $fontset_key) {
+            $fontset_list[$fontset_key]=$fontset_key;
+        }
+        ksort($fontset_list);
     }
-    ksort($fontset_list);
 
     if (count($fontset_list) > 1) {
         $fontset_list = array_merge(array('' => _("Default font style")), $fontset_list);
@@ -219,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(
@@ -398,7 +407,7 @@ function load_optpage_data_display() {
 
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'delete_prev_next_display',
-        'caption' => _("Show 'Delete & Prev/Next' Links"),
+        'caption' => _("Show 'Delete &amp; Prev/Next' Links"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_ALL
     );
@@ -488,4 +497,4 @@ function icon_theme_save($option) {
 
 }
 
-?>
\ No newline at end of file
+?>