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 bf5bc2eb88354a9fc6fa7b15948896e9ce4f252b..5042302086889d84e6c3f4e742407e3400ba98d3 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -57,17 +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
      */
-    $templateid=basename($sTplDir);
+    $templatedir=basename($sTplDir);
     $oTemplate->assign('base_uri',$base_uri);
-    $oTemplate->assign('templateid',$templateid);
+    $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='.$templateid
-        .(!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";