Dev: fixed issue #11900: Fatal error in demosurvey

Dev: sid not sessid ... Dev: answer_width_bycolumn not answer_width (for array by column)
LimeSurvey · Nov 14, 2016 · cb3ec7b · cb3ec7b
1 parent e7cfb97
commit cb3ec7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -10359,7 +10359,7 @@ private static function checkValidityAnswer($type,$value,$sgq,$qinfo)
                         }
                         break;
                     case 'I': // Language switch
-                        if(!in_array($value,Survey::model()->findByPk($LEM->sessid)->getAllLanguages()))
+                        if(!in_array($value,Survey::model()->findByPk($LEM->sid)->getAllLanguages()))
                         {
                             $LEM->invalidAnswerString[$sgq]=sprintf(gT("%s is an invalid value for this question"),htmlspecialchars($value));
                             return false;

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -3224,7 +3224,7 @@ function do_multiplenumeric($ia)
             if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])){
                 $sValue                = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
             }
-            elseif( $slider_default !== "" && $slider_default_set){
+            elseif( $slider_layout && $slider_default !== "" && $slider_default_set){
                 $sValue                = $slider_default;
             }else{
                 $sValue                = '';
@@ -5944,8 +5944,8 @@ function do_arraycolumns($ia)
 
         if ($anscount>0)
         {
-            if(trim($aQuestionAttributes['answer_width'])!=''){
-                $answerwidth=trim($aQuestionAttributes['answer_width']);
+            if(trim($aQuestionAttributes['answer_width_bycolumn'])!=''){
+                $answerwidth=trim($aQuestionAttributes['answer_width_bycolumn']);
                 $defaultWidth=false;
             }else{
                 $answerwidth=33;