Variable name is misleading, if technically correct. I'd personally eventually like...

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

diff --git a/functions/page_header.php b/functions/page_header.php
index bf5bc2eb88354a9fc6fa7b15948896e9ce4f252b..510b4f56937c3e605bfd9cf30323cb660efe15de 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -57,14 +57,14 @@ 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
      */
      * 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('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
     $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
+        .'&amp;templatedir='.$templatedir

         .(!empty($used_fontset) ? '&amp;fontset='.$used_fontset : '')
         .(!empty($used_fontsize) ? '&amp;fontsize='.$used_fontsize : '')
         .(!empty($text_direction) ? '&amp;dir='.$text_direction : '')."\">\n";
         .(!empty($used_fontset) ? '&amp;fontset='.$used_fontset : '')
         .(!empty($used_fontsize) ? '&amp;fontsize='.$used_fontsize : '')
         .(!empty($text_direction) ? '&amp;dir='.$text_direction : '')."\">\n";