Add javascript_on to the list of variables that are always available to templates.

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

diff --git a/include/init.php b/include/init.php
index 1a5e00edb11089a2e818409754d2be9c7fbd5416..f58bf5460b1067108e5dfbf5545a047fbb899a06 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -543,7 +543,7 @@ if (!isset($sTemplateID)) {
 $oTemplate = Template::construct_template($sTemplateID);
 
 // We want some variables to always be available to the template
-$always_include = array('sTemplateID', 'icon_theme_path');
+$always_include = array('sTemplateID', 'icon_theme_path', 'javascript_on');
 foreach ($always_include as $var) {
     $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
 }

diff --git a/src/signout.php b/src/signout.php
index e7082fe906ef71f8efae27de2c1787cab8f32d46..7a19b4e9e5864d6577f242c432ad236dc1fc6a97 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -55,7 +55,7 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) {
     $oTemplate = Template::construct_template($sTemplateID);
 
     // We want some variables to always be available to the template
-    $always_include = array('sTemplateID', 'icon_theme_path');
+    $always_include = array('sTemplateID', 'icon_theme_path', 'javascript_on');
     foreach ($always_include as $var) {
         $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
     }