Dev: prepared LS_Twig_Extension (direct goal: add functions to regist…

…er css/js with or without asset manager depending on debug mode)
LimeSurvey · Jan 9, 2017 · b81e9a6 · b81e9a6
1 parent 54f6de1
commit b81e9a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -198,6 +198,7 @@
             ),
             // Those extensions, include the sendbox, will be done later in the process
             'extensions' => array(
+                'LS_Twig_Extension',
                 'Twig_Extension_Sandbox',
                 'Twig_Extension_StringLoader',
                 'Twig_Extension_Debug',
@@ -210,6 +211,7 @@
                 'getLanguageData'       => 'viewHelper::getLanguageData',
                 'array_flip'            => 'array_flip',
                 'array_intersect_key'   => 'array_intersect_key',
+                'registerPublicCssFile' => 'LS_Twig_Extension::registerPublicCssFile'
             ),
             'filters' => array(
                 'jencode' => 'CJSON::encode',
@@ -228,7 +230,7 @@
                     'ETwigViewRendererYiiCoreStaticClassesProxy'=>array("Html"),
                     'LSYii_Application'                 =>  array("request"),
                 ),
-                'functions' => array('include', 'dump', 'flatEllipsizeText', 'getLanguageData', 'array_flip', 'array_intersect_key')
+                'functions' => array('include', 'dump', 'flatEllipsizeText', 'getLanguageData', 'array_flip', 'array_intersect_key', 'registerPublicCssFile')
             )
 
             // Change template syntax to Smarty-like (not recommended)

diff --git a/application/core/LS_Twig_Extension.php b/application/core/LS_Twig_Extension.php
@@ -0,0 +1,9 @@
+<?php
+class LS_Twig_Extension extends Twig_Extension
+{
+
+    static public function registerPublicCssFile($value)
+    {
+        Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . $value);
+    }
+}
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -295,8 +295,6 @@ public function run($surveyid,$args)
         }
 
         if (!(isset($languagechanger) && strlen($languagechanger) > 0) && function_exists('makeLanguageChangerSurvey')){
-
-            $languagechanger = makeLanguageChangerSurvey($_SESSION[$LEMsessid]['s_lang'], false, false);
             $thissurvey['alanguageChangerDatas'] = makeLanguageChangerSurvey($_SESSION[$LEMsessid]['s_lang'], false, true);
         }