Fixed issue: sutename, siteadminemail ans siteadminname are not used …

…in template editor
LimeSurvey · Oct 13, 2012 · 333090e · 333090e
1 parent 5bf158e
commit 333090e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -727,8 +727,6 @@ protected function _initcssfiles()
     */
     protected function _initialise($templatename, $screenname, $editfile, $showsummary = true)
     {
-        global $siteadminname, $siteadminemail;
-
         $clang = $this->getController()->lang;
         Yii::app()->loadHelper('surveytranslator');
         Yii::app()->loadHelper('admin/template');
@@ -857,6 +855,11 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
         foreach ($cssfiles as $fl)
             $normalfiles[] = $fl["name"];
 
+        // Some global data
+        $aData['sitename'] = Yii::app()->getConfig('sitename');
+        $siteadminname = Yii::app()->getConfig('siteadminname');
+        $siteadminemail = Yii::app()->getConfig('siteadminemail');
+
         // Set this so common.php doesn't throw notices about undefined variables
         $thissurvey['active'] = 'N';