Fixed issue #6035: Insertans not working in multiple options with com…

…ments
LimeSurvey · Apr 20, 2012 · 0e69577 · 0e69577
1 parent 01b314b
commit 0e69577
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -2396,7 +2396,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                 'jsName'=>'',
                 'readWrite'=>'N',
                 );
-                
+
                 foreach ($attrs as $key)
                 {
                     if (preg_match('/^(firstname|lastname|email|usesleft|token|attribute_\d+)$/',$key))
@@ -6380,10 +6380,13 @@ private function _GetVarAttribute($name,$attr,$default,$gseq,$qseq)
                                 break;
                             case 'M': //Multiple choice checkbox
                             case 'P': //Multiple choice with comments checkbox + text
-                                if ($code == 'Y' && isset($var['question']))
+                                if ($code == 'Y' && isset($var['question']) && !preg_match('/comment$/',$sgqa))
                                 {
                                     $shown = $var['question'];
                                 }
+                                elseif (preg_match('/comment$/',$sgqa) && isset($_SESSION[$sgqa])) {
+                                    $shown = $_SESSION[$sgqa];
+                                }
                                 else
                                 {
                                     $shown = $default;