Fixed issue #12418: Develop branche still broken

LimeSurvey · May 22, 2017 · 35dc2a6 · 35dc2a6
1 parent e295c5b
commit 35dc2a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php
@@ -32,8 +32,10 @@ public function actionPublicList($lang = null)
 
 
             $this->sTemplate = $oTemplate->name;
-            Yii::app()->clientScript->registerPackage( 'survey-template' );
-//            $this->aGlobalData['languagechanger'] = makeLanguageChanger(App()->language);
+            //Yii::app()->clientScript->registerPackage( 'survey-template' );
+            //Yii::app()->clientScript->registerPackage( 'survey-template-'.$oTemplate->sTemplateName );
+            //var_dump('survey-template-'.$oTemplate->sTemplateName);
+
 
             $aData = array(
                     'publicSurveys'     => Survey::model()->active()->open()->public()->with('languagesettings')->findAll(),

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -172,7 +172,7 @@ public function setTemplateConfiguration($sTemplateName='', $iSurveyId='')
 
         /* Add depend package according to packages */
         $this->otherFiles               = $this->setOtherFiles();
-
+        $this->createTemplatePackage($oTemplateToConfigure);    
         libxml_disable_entity_loader($bOldEntityLoaderState);                   // Put back entity loader to its original state, to avoid contagion to other applications on the server
         return $this;
     }
@@ -187,7 +187,7 @@ private function setThisTemplate($oTemplateToConfigure)
         $this->cssFramework->name       = (isset($oTemplateToConfigure->config->engine->cssframework->name))       ? $oTemplateToConfigure->config->engine->cssframework->name                                                                            : (string) $oTemplateToConfigure->config->engine->cssframework;
         $this->packages                 = (isset($oTemplateToConfigure->config->engine->packages))                 ? $oTemplateToConfigure->config->engine->packages                                                                                      : array();
         // Package creation
-        $this->createTemplatePackage($oTemplateToConfigure);
+
     }
 
     /**