From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 10 Jul 2005 13:36:19 +0000 (+0000)
Subject: load default theme in logout_error if possible.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d2b6d0bee8a4c6747a22698019413b896158e217;p=squirrelmail.git

load default theme in logout_error if possible.


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

diff --git a/ChangeLog b/ChangeLog
index d30f3f48..ec7e80a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -398,6 +398,7 @@ Version 1.5.1 -- CVS
   - Moved time zone configuration from locale/timezones.cfg to php array.
     Adds time zone name localization options and fixes problems on systems
     that don't support GNU C time zone mappings (#1177067).
+  - Use default color theme in logout_error function when possible.
 
 Version 1.5.0 - 2 February 2004
 -------------------------------
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 023913b0..20b3fe77 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -84,7 +84,8 @@ function plain_error_message($message, $color) {
  */
 function logout_error( $errString, $errTitle = '' ) {
     global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
-           $hide_sm_attributions, $version, $squirrelmail_language, $color;
+           $hide_sm_attributions, $version, $squirrelmail_language, 
+           $color, $theme, $theme_default;
 
     $base_uri = sqm_baseuri();
 
@@ -106,7 +107,10 @@ function logout_error( $errString, $errTitle = '' ) {
         $frame_top = '_top';
     }
 
-    // TODO: load default theme if possible
+    // load default theme if possible
+    if (!isset($color) && @file_exists($theme[$theme_default]['PATH']))
+        @include ($theme[$theme_default]['PATH']);
+
     if ( !isset( $color ) ) {
         $color = array();
         $color[0]  = '#dcdcdc';  /* light gray    TitleBar               */