Fixed issue #6854: INSERTANS or .shown not working for comment on Mul…

…tiple options with comments Fixed issue: EM return code for single choice question .shown
LimeSurvey · Nov 21, 2012 · 1b47394 · 1b47394
1 parent 4528cb2
commit 1b47394
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -6481,7 +6481,7 @@ private function _GetVarAttribute($name,$attr,$default,$gseq,$qseq)
                     {
                         $q = $var['q'];
                         $ansArray = isset($var['ansArray']) ? $var['ansArray'] : null;
-                        return $q->getVarAttributeValueNAOK($name, $default, $gseq, $qseq, $ansArray);
+                        return $q->getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray);
                     }
                 case 'relevanceStatus':
                     $gseq = (isset($var['gseq'])) ? $var['gseq'] : -1;

diff --git a/application/modules/CheckQuestion.php b/application/modules/CheckQuestion.php
@@ -584,14 +584,11 @@ public function includeRelevanceStatus()
 
     public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
     {
-        $code = LimeExpressionManager::GetVarAttribute($name,'code',$default,$gseq,$qseq);
-        if ($code == 'Y' && isset($this->sq) && !preg_match('/comment$/',$this->fieldname))
+        $code = parent::getVarAttributeShown($name,'code',$default,$gseq,$qseq);
+        if ($code == 'Y')
         {
             return $this->sq;
         }
-        elseif (preg_match('/comment$/',$this->fieldname) && isset($_SESSION[$this->fieldname])) {
-            return $_SESSION[$this->fieldname];
-        }
         else
         {
             return $default;
@@ -861,4 +858,4 @@ public function questionProperties($prop = false)
         return $prop?$props[$prop]:$props;
     }
 }
-?>
+?>
diff --git a/application/modules/CommentCheckQuestion.php b/application/modules/CommentCheckQuestion.php
@@ -316,6 +316,18 @@ public function getShownJS()
                 . 'return htmlspecialchars_decode(attr.question);';
     }
 
+    public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
+    {
+        $name=preg_replace('/\.shown$/','',$name);
+        if (preg_match('/comment$/',$name)) {
+            return LimeExpressionManager::GetVarAttribute($name,'code',$default,$gseq,$qseq);
+        }
+        else
+        {
+            return parent::getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray);
+        }
+    }
+
     public function getDataEntryView($language)
     {
         $meaquery = "SELECT * FROM {{questions}} WHERE parent_qid={$this->id} AND language='{$language->getlangcode()}' ORDER BY question_order, question";
@@ -412,4 +424,4 @@ public function questionProperties($prop = false)
         return $prop?$props[$prop]:$props;
     }
 }
-?>
+?>
diff --git a/application/modules/QuestionModule.php b/application/modules/QuestionModule.php
@@ -542,4 +542,4 @@ public function QueXMLAppendAnswers(&$question)
     abstract public function availableAttributes($attr = false);
     abstract public function questionProperties($prop = false);
 }
-?>
+?>