Fixed issue #CT-778: Wrong placeholder field codes in html editor

LimeSurvey · May 15, 2024 · 9efa851 · 9efa851
1 parent 632e9e7
commit 9efa851
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/application/controllers/LimereplacementfieldsController.php b/application/controllers/LimereplacementfieldsController.php
@@ -212,8 +212,26 @@ private function getChildQuestions(array $questions)
                 $question = "[{$row['subquestion2']}] " . $question;
             }
 
+            $replacementCode = $row['title'];
+            if (array_key_exists('aid', $row) && $row['aid'] !== '') {
+                $replacementCode = $row['title'] . '_' . $row['aid'];
+                if (array_key_exists('scale_id', $row)) {
+                    $replacementCode = $replacementCode . '_' . $row['scale_id'];
+                }
+                if (strpos($replacementCode, '_other') === false) {
+                    $replacementCode = $replacementCode . '.shown';
+                }
+            }
             $shortquestion = $row['title'] . ": " . flattenText($question);
-            $cquestions[] = array($shortquestion, $row['qid'], $row['type'], $row['fieldname'], $row['previouspage'], $row['title']);
+            $cquestions[] = array(
+                $shortquestion,
+                $row['qid'],
+                $row['type'],
+                $row['fieldname'],
+                $row['previouspage'],
+                $row['title'],
+                $replacementCode
+            );
         }
         return $cquestions;
     }

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -8632,7 +8632,7 @@ private function _GetVarAttribute($name, $attr, $default, $gseq, $qseq)
                 // NB: No break needed
             case 'code':
             case 'NAOK':
-                if (isset($var['code'])) {
+                if (array_key_exists('code', $var) && isset($var['code'])) {
                     return $var['code'];    // for static values like TOKEN
                 } else {
                     if (isset($_SESSION[$this->sessid][$sgqa])) {

diff --git a/application/views/limereplacementfields/limeReplacementFields_view.php b/application/views/limereplacementfields/limeReplacementFields_view.php
@@ -46,7 +46,7 @@ function Ok()
                     $isDisabled = " disabled='disabled'";
                 }
                 ?>
-                    <option value='<?php echo $cqn[5];?>.shown' title='<?php echo $cqn[0];?>' <?php echo $isDisabled;?>><?php echo $cqn[0];?></option>
+                    <option value='<?php echo $cqn[6];?>' title='<?php echo $cqn[0];?>' <?php echo $isDisabled;?>><?php echo $cqn[0];?></option>
                     <?php
             }
             ?>