Dev: corequestiontemplatedir => corequestionthemedir

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

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -639,8 +639,8 @@
 $config['uploaddir']                    = $config['rootdir'].DIRECTORY_SEPARATOR."upload";
 $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['corequestionthemerootdir']  = $config['rootdir'].DIRECTORY_SEPARATOR.$config['corequestiontemplatedir'];   // The directory containing the core's question templates.
+$config['corequestionthemedir']      = "question_templates";
+$config['corequestionthemerootdir']  = $config['rootdir'].DIRECTORY_SEPARATOR.$config['corequestionthemedir'];   // 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
@@ -348,7 +348,7 @@ public function getTemplateUrl()
             $sCoreQTemplateRootDir  = Yii::app()->getConfig("corequestionthemerootdir");
             $sUserQTemplateRootDir  = Yii::app()->getConfig("userquestionthemerootdir");
 
-            $sCoreQTemplateDir  = Yii::app()->getConfig("corequestiontemplatedir");
+            $sCoreQTemplateDir  = Yii::app()->getConfig("corequestionthemedir");
 
             // Core templates come first
             if(is_dir("$sCoreQTemplateRootDir/$sTemplateFolderName/")) {