Merge remote-tracking branch 'origin/develop' into develop

LimeSurvey · Jun 2, 2017 · feaec1d · feaec1d
2 parents ccb8c0e + 1a5634b
commit feaec1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -471,7 +471,7 @@ private function display($iSurveyId)
         $oTemplate = Template::model()->getInstance('', $iSurveyId);
         Yii::app()->clientScript->registerPackage( 'survey-template' );
 
-        $this->sTemplate=$oTemplate->name;
+        $this->sTemplate=$oTemplate->sTemplateName;
         if(!$this->sMessage){
             $this->aGlobalData['languagechanger']=makeLanguageChangerSurvey($sLanguage); // Only show language changer shown the form is shown, not after submission
             $this->aReplacementData['content']=self::getRegisterForm($iSurveyId);

diff --git a/application/controllers/SurveysController.php b/application/controllers/SurveysController.php
@@ -31,7 +31,7 @@ public function actionPublicList($lang = null)
             //$oTemplate->registerAssets();
 
 
-            $this->sTemplate = $oTemplate->name;
+            $this->sTemplate = $oTemplate->sTemplateName;
             //Yii::app()->clientScript->registerPackage( 'survey-template' );
             //Yii::app()->clientScript->registerPackage( 'survey-template-'.$oTemplate->sTemplateName );
             //var_dump('survey-template-'.$oTemplate->sTemplateName);
@@ -70,7 +70,7 @@ public function actionError()
         {
             $oTemplate = Template::model()->getInstance(Yii::app()->getConfig("defaulttemplate"));
 
-            $this->sTemplate = $oTemplate->name;
+            $this->sTemplate = $oTemplate->sTemplateName;
 
             $error = Yii::app()->errorHandler->error;
             if ($error){
@@ -81,5 +81,4 @@ public function actionError()
             }
         }
 
-    }
-?>
+    }