Dev: corequestiontemplaterootdir => corequestionthemerootdir

LimeSurvey · Nov 21, 2017 · 177de9a · 177de9a
1 parent c7401c7
commit 177de9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -640,7 +640,7 @@
 $config['standardtemplaterootdir']      = $config['rootdir'].DIRECTORY_SEPARATOR."templates";            // The directory path of the standard templates
 $config['publicstylepath']              = $config['rootdir'].DIRECTORY_SEPARATOR.$config['publicstyle'];
 $config['corequestiontemplatedir']      = "question_templates";
-$config['corequestiontemplaterootdir']  = $config['rootdir'].DIRECTORY_SEPARATOR.$config['corequestiontemplatedir'];   // The directory containing the core's question templates.
+$config['corequestionthemerootdir']  = $config['rootdir'].DIRECTORY_SEPARATOR.$config['corequestiontemplatedir'];   // The directory containing the core's question templates.
 $config['styledir']                     = $config['rootdir'].DIRECTORY_SEPARATOR.$config['assets'].DIRECTORY_SEPARATOR.'styles-admin';
 $config['questiontypedir']              = $config['rootdir'].DIRECTORY_SEPARATOR.'application'.DIRECTORY_SEPARATOR.'extensions'.DIRECTORY_SEPARATOR.'questionTypes';
 $config['userthemerootdir']          = $config['uploaddir'].DIRECTORY_SEPARATOR."templates"; // The directory path of the user templates

diff --git a/application/models/QuestionTemplate.php b/application/models/QuestionTemplate.php
@@ -122,7 +122,7 @@ public function getTemplatePath()
     {
         if (!isset($this->sTemplatePath)){
             $sTemplateFolderName    = $this->getQuestionTemplateFolderName();
-            $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestiontemplaterootdir");
+            $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestionthemerootdir");
             $sUserQTemplateRootDir  = Yii::app()->getConfig("userquestionthemerootdir");
 
             // Core templates come first
@@ -345,7 +345,7 @@ public function getTemplateUrl()
             $sBaseUrl               = Yii::app()->getBaseUrl(true);
             $sFolderName            = self::getFolderName($this->oQuestion->type);
             $sTemplateFolderName    = $this->getQuestionTemplateFolderName();
-            $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestiontemplaterootdir");
+            $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestionthemerootdir");
             $sUserQTemplateRootDir  = Yii::app()->getConfig("userquestionthemerootdir");
 
             $sCoreQTemplateDir  = Yii::app()->getConfig("corequestiontemplatedir");
@@ -427,7 +427,7 @@ static public function getQuestionTemplateUserList($type)
      */
     static public function getQuestionTemplateCoreList($type)
     {
-        $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestiontemplaterootdir");
+        $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestionthemerootdir");
         $aQuestionTemplates     = array();
 
         $sFolderName    = self::getFolderName($type);