X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fload_prefs.php;h=3691d079c062912dce0f26515a343e492bcb2587;hb=80bb6546e5f0602d8c055df1f37b64ab030d6657;hp=844ce3a61ad41fd31333ba732d2e40cd7259addc;hpb=e2ab93e54b0576afcc455883e256862fa939c79c;p=squirrelmail.git

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 844ce3a6..3691d079 100644
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -31,12 +31,9 @@
 		 break;
 	  }
    }
-   if (!$in_ary) {
-   		$chosen_theme = "";
-   }
 
-   if ((isset($chosen_theme)) && (file_exists($chosen_theme))) {
-      $loaded=@include("$chosen_theme");
+   if ($in_ary && (file_exists($chosen_theme))) {
+      $loaded=@include($chosen_theme);
    } else {
       if (file_exists($theme[0]["PATH"])) {
          require($theme[0]["PATH"]);
@@ -61,7 +58,9 @@
           $color[11]  = "#770000"; // (dark red)       Special Folders color
       }
    }
-    if (!isset($loaded)) echo "loading configured theme $chosen_theme failed";
+    if (!isset($loaded)) 
+      echo _("Unable to load chosen theme file:") . ' "' .
+	$chosen_theme . '"';
     if (!isset($download_php)) session_register("theme_css");
 
    $use_javascript_addr_book = getPref($data_dir, $username, "use_javascript_addr_book");