From 4f0058bb80d24793514083cbfc286c95c78f84f6 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Thu, 28 Dec 2017 16:34:54 +0100 Subject: [PATCH] Fixed issue: can't save question custom attributes for question themes --- application/controllers/admin/database.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php index 94e36c66bd8..26867cd5209 100644 --- a/application/controllers/admin/database.php +++ b/application/controllers/admin/database.php @@ -539,13 +539,13 @@ private function actionUpdateQuestion($iSurveyID) $criteria->compare('qid', $this->iQuestionID); $validAttributes = \LimeSurvey\Helpers\questionHelper::getQuestionAttributesSettings($sQuestionType); // If the question has a custom template, we first check if it provides custom attributes - //~ $oAttributeValues = QuestionAttribute::model()->find("qid=:qid and attribute='question_template'",array('qid'=>$cqr->qid)); - //~ if (is_object($oAttributeValues && $oAttributeValues->value)){ - //~ $aAttributeValues['question_template'] = $oAttributeValues->value; - //~ }else{ - //~ $aAttributeValues['question_template'] = 'core'; - //~ } - //~ $validAttributes = Question::getQuestionTemplateAttributes($validAttributes, $aAttributeValues, $cqr ); + $oAttributeValues = QuestionAttribute::model()->find("qid=:qid and attribute='question_template'",array('qid'=>$cqr->qid)); + if (is_object($oAttributeValues) && $oAttributeValues->value ){ + $aAttributeValues['question_template'] = $oAttributeValues->value; + }else{ + $aAttributeValues['question_template'] = 'core'; + } + $validAttributes = Question::getQuestionTemplateAttributes($validAttributes, $aAttributeValues, $cqr ); foreach ($validAttributes as $validAttribute) { $criteria->compare('attribute', '<>'.$validAttribute['name']); }