Correct me if I'm wrong (because oddly, this seemed to be working previously for...

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index c88c78e711958bc9ca98550cec6e468a9ff4b248..5042302086889d84e6c3f4e742407e3400ba98d3 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -27,7 +27,7 @@ include_once(SM_PATH . 'functions/imap_mailbox.php');
  * @return void
  */
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE, $frames = FALSE ) {
-    global $squirrelmail_language, $sTplDir, $oErrorHandler;
+    global $squirrelmail_language, $sTplDir, $oErrorHandler, $oTemplate;
 
     if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
         global $base_uri;
@@ -57,13 +57,17 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
      * Add closing / to link and meta elements only after switching to xhtml 1.0 Transitional.
      * It is not compatible with html 4.01 Transitional
      */
+    $templatedir=basename($sTplDir);
+    $oTemplate->assign('base_uri',$base_uri);
+    $oTemplate->assign('templatedir',$templatedir);
+    $oTemplate->assign('themeid',$used_theme);
+    $oTemplate->display('stylelink.tpl');
     echo '<link rel="stylesheet" type="text/css" href="'. $base_uri .'src/style.php'
         .'?themeid='.$used_theme
-        .'&amp;templateid='.basename($sTplDir)
-        .(!empty($used_fontset) ? '&amp;fontset='.$used_fontset : '')
-        .(!empty($used_fontsize) ? '&amp;fontsize='.$used_fontsize : '')
-        .(!empty($text_direction) ? '&amp;dir='.$text_direction : '')."\">\n";
-
+        .'&templatedir='.$templatedir
+        .(!empty($used_fontset) ? '&fontset='.$used_fontset : '')
+        .(!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '')
+        .(!empty($text_direction) ? '&dir='.$text_direction : '')."\">\n";
     // load custom style sheet (deprecated)
     if ( ! empty($theme_css) ) {
         echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$theme_css\">\n";
@@ -88,16 +92,14 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     /* work around IE6's scrollbar bug */
     echo <<<ECHO
+<!--[if IE 6]>
 <style type="text/css">
-<!--
 /* avoid stupid IE6 bug with frames and scrollbars */
 body {
-    voice-family: "\"}\"";
-    voice-family: inherit;
     width: expression(document.documentElement.clientWidth - 30);
 }
--->
 </style>
+<![endif]-->
 
 ECHO;