Fixed issue #15585: Custom question attributes not available

LimeSurvey · Jan 16, 2020 · 43300c5 · 43300c5
1 parent 7c04afd
commit 43300c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -335,7 +335,7 @@ public static function getQuestionTemplateAttributes($aAttributeNames, $aAttribu
                 $oQuestionTemplate = QuestionTemplate::getInstance($oQuestion);
                 if ($oQuestionTemplate->bHasCustomAttributes) {
                     // Add the custom attributes to the list
-                    foreach ($oQuestionTemplate->oConfig->attributes as $attribute) {
+                    foreach ($oQuestionTemplate->oConfig->attributes->attribute as $attribute) {
                         $sAttributeName = (string) $attribute->name;
                         $sInputType = (string)$attribute->inputtype;
                         // remove attribute if inputtype is empty

diff --git a/application/models/QuestionAttribute.php b/application/models/QuestionAttribute.php
@@ -239,6 +239,7 @@ public function getQuestionAttributes($iQuestionID, $sLanguage = null)
             /* Get whole existing attribute for this question in an array*/
             $oAttributeValues = self::model()->findAll("qid=:qid", array('qid'=>$iQuestionID));
 
+            // insert additional attributes from an extended question theme
             foreach ($oAttributeValues as $oAttributeValue) {
                 if ($oAttributeValue->attribute == 'question_template') {
                     $aAttributeValues['question_template'] = $oAttributeValue->value;

diff --git a/application/models/QuestionTemplate.php b/application/models/QuestionTemplate.php
@@ -127,10 +127,10 @@ public function getTemplatePath()
             $sUserQTemplateRootDir  = Yii::app()->getConfig("userquestionthemerootdir");
 
             // Core templates come first
-            if (is_dir("$sCoreQTemplateRootDir/$sTemplateFolderName/")) {
-                $this->sTemplatePath = "$sCoreQTemplateRootDir/$sTemplateFolderName/";
-            } elseif (is_dir("$sUserQTemplateRootDir/$sTemplateFolderName/")) {
-                $this->sTemplatePath = "$sUserQTemplateRootDir/$sTemplateFolderName/";
+            if (is_dir("$sCoreQTemplateRootDir/$sTemplateFolderName")) {
+                $this->sTemplatePath = "$sCoreQTemplateRootDir/$sTemplateFolderName";
+            } elseif (is_dir("$sUserQTemplateRootDir/$sTemplateFolderName")) {
+                $this->sTemplatePath = "$sUserQTemplateRootDir/$sTemplateFolderName";
             }
         }
         return $this->sTemplatePath;