From ab034e59a37f60553363563176f40fc75576a71b Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Mon, 2 Oct 2006 16:36:30 +0000 Subject: [PATCH] $theme_css is no longer supported. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11810 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 3 +-- config/config_default.php | 1 - functions/page_header.php | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index d87b702e..9dec82ff 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -330,7 +330,7 @@ while ( $line = ) { $ldap_writeable[$sub] = $writeable; $ldap_search_tree[$sub] = $search_tree; $ldap_starttls[$sub] = $starttls; - } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page|icon_theme_def)$/ ) { + } elsif ( $options[0] =~ /^(data_dir|attachment_dir|org_logo|signout_page|icon_theme_def)$/ ) { ${ $options[0] } = &change_to_rel_path($options[1]); } else { ${ $options[0] } = $options[1]; @@ -4102,7 +4102,6 @@ sub save_data { print CF "\n"; # strings - print CF "\$theme_css = " . &change_to_SM_path($theme_css) . ";\n"; if ( $theme_default eq '' ) { $theme_default = '0'; } print CF "\$theme_default = $theme_default;\n"; diff --git a/config/config_default.php b/config/config_default.php index 4b0d442c..c9e6f27b 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -675,7 +675,6 @@ $session_name = 'SQMSESSID'; * $theme_default sets theme that will be used by default * used by default. * @global integer $theme_default - * @global string $theme_css */ $theme_default = 0; diff --git a/functions/page_header.php b/functions/page_header.php index 700d2210..beafbdb6 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -32,7 +32,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) { global $base_uri; } - global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction, + global $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction, $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme; /* add no cache headers here */ -- 2.25.1