Reverting other changes that snuck in. These need to wait for a bit until other...

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

diff --git a/functions/page_header.php b/functions/page_header.php
index 7bf3ec40273076176b57150fa6e23e40cf0f7c86..d13bb825f0d65052910930f1ce2875d9733c2cc2 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -190,7 +190,8 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
     }
 
     if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
-        $js_includes = $oTemplate->get_javascript_includes(TRUE);
+        $js_includes = $oTemplate->getJavascriptIncludes();
+        //$js_includes = $oTemplate->get_javascript_includes(TRUE);
         $sJsBlock = '';
         foreach ($js_includes as $js_file) {
             $sJsBlock .= '<script src="'.$js_file.'" type="text/javascript"></script>' ."\n";
@@ -279,7 +280,8 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
         }
         $sJsBlock .= "\n";
 
-        $js_includes = $oTemplate->get_javascript_includes(TRUE);
+        $js_includes = $oTemplate->getJavascriptIncludes();
+        //$js_includes = $oTemplate->get_javascript_includes(TRUE);
         foreach ($js_includes as $js_file) {
             $sJsBlock .= '<script src="'.$js_file.'" type="text/javascript"></script>' ."\n";
         }