From 35dc2a6e6a8d920aa9ff7d33164e57deef36d180 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Mon, 22 May 2017 17:27:22 +0200 Subject: [PATCH] Fixed issue #12418: Develop branche still broken --- application/controllers/SurveysController.php | 6 ++++-- application/models/TemplateConfiguration.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php index 93786811892..20820ffe191 100644 --- 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 index cbbf9f67b6d..8dee4c83d75 100644 --- 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); + } /**