fix for getting filenames for attachments

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index c0a7a913a8cfed12e7666b0dbf629b5ed2d082b6..457aef0e67539591f876ea53227cf533cf7c894b 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -37,8 +37,8 @@ $chosen_theme = (!$found_theme ? '' : $chosen_theme);
 if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
     @include_once($chosen_theme);
 } else {
-    if (isset($theme) && isset($theme[0]) && file_exists($theme[0]['PATH'])) {
-        @include_once($theme[0]['PATH']);
+    if (isset($theme) && isset($theme[$theme_default]) && file_exists($theme[$theme_default]['PATH'])) {
+        @include_once($theme[$theme_default]['PATH']);
     } else {
         /**
          * This theme as a failsafe if no themes were found. It makes
@@ -210,6 +210,9 @@ $hour_format = getPref($data_dir, $username, 'hour_format', 2);
 
 /*  compose in new window setting */
 $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+$compose_height = getPref($data_dir, $username, 'compose_height', 550);
+$compose_width = getPref($data_dir, $username, 'compose_width', 640);
+
 
 /* signature placement settings */
 $sig_first = getPref($data_dir, $username, 'sig_first', 0);
@@ -217,8 +220,7 @@ $sig_first = getPref($data_dir, $username, 'sig_first', 0);
 /* use the internal date of the message for sorting instead of the supplied header date */
 $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
 
-/* if thread sorting is enabled/disabled */
-$thread_sort_messages = getPref($data_dir, $username, 'thread_sort_messages', 0);
+/* if server sorting is enabled/disabled */
 $sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
 
 /* Load the javascript settings. */