Some variables are needed by all templates to make creation easier. Make sure they...

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

diff --git a/class/template/template.class.php b/class/template/template.class.php
index 238b8ac1aead520e3b5b11d785d1f919057df3ee..238d0d1379ae8f05881985de5f44c0170f26d564 100755 (executable)
--- a/class/template/template.class.php
+++ b/class/template/template.class.php
@@ -203,6 +203,17 @@ class Template
    */
   function display($file)
   {
+    /**
+     * We want to make sure that certain variables are always passed to the
+     * templates b/c they are critical to certain template functions.
+     */
+    $always_include = array('icon_theme_path', 'sTplDir');
+    foreach ($always_include as $var) {
+        if (!isset($this->values[$var]) && isset($GLOBALS[$var])) {
+            $this->assign($var, $GLOBALS[$var]);
+        }
+    }
+    
     // Pull in our config file
     $t = &$this->values; // place values array directly in scope