Fixed issue #16140: Error 500 each time save a question (debug > 1)

Dev: merge with QuestionAttribute::getDefaultSettings
LimeSurvey · Apr 16, 2020 · a62fbb5 · a62fbb5
1 parent 66ff71b
commit a62fbb5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/application/models/QuestionBaseDataSet.php b/application/models/QuestionBaseDataSet.php
@@ -412,8 +412,9 @@ protected function getValidationInput()
 
     protected function parseFromAttributeHelper($sAttributeKey, $aAttributeArray)
     {
+        $aAttributeArray = array_merge(QuestionAttribute::getDefaultSettings(),$aAttributeArray);
         $aAdvancedAttributeArray = [
-            'name' => $sAttributeKey,
+            'name' => empty($aAttributeArray['name']) ? $sAttributeKey : $aAttributeArray['name'],
             'title' => CHtml::decode($aAttributeArray['caption']),
             'inputtype' => $aAttributeArray['inputtype'],
             'formElementId' => $sAttributeKey,