Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git int…

…o develop # Conflicts: # application/controllers/admin/questions.php # application/core/Survey_Common_Action.php # application/helpers/expressions/em_manager_helper.php # application/helpers/questionHelper.php
LimeSurvey · Oct 23, 2018 · b270345 · b270345
2 parents 762602c + 2461a56
commit b270345
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 57 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -356,7 +356,7 @@ private function actionUpdateAnswerOptions($iSurveyID)
     }
 
     /**
-     * action to do when update sub-questions
+     * action to do when update subquestions
      * @param integer $iSurveyID
      * @return void
      * @throws CHttpException

diff --git a/application/core/LsDefaultDataSets.php b/application/core/LsDefaultDataSets.php
@@ -111,6 +111,7 @@ public static function getTemplateDefaultTexts($mode, $language='en')
     public static function getSurveyMenuData()
     {
         $headerArray = [
+            'id',
             'parent_id',
             'survey_id',
             'user_id',
@@ -130,9 +131,9 @@ public static function getSurveyMenuData()
         $sOldLanguage = App()->language;
         App()->setLanguage('en');
         $returnArray = [];
-        $returnArray[] = array_combine($headerArray, [null,null,null,1,0,'settings',gT('Survey settings'),'side',gT('Survey settings'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,1]);
-        $returnArray[] = array_combine($headerArray, [null,null,null,2,0,'mainmenu',gT('Survey menu'),'side',gT('Main survey menu'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,1]);
-        $returnArray[] = array_combine($headerArray, [null,null,null,3,0,'quickmenu',gT('Quick menu'),'collapsed',gT('Quick menu'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,0]);
+        $returnArray[] = array_combine($headerArray, [1,null,null,null,1,0,'settings',gT('Survey settings'),'side',gT('Survey settings'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,1]);
+        $returnArray[] = array_combine($headerArray, [2,null,null,null,2,0,'mainmenu',gT('Survey menu'),'side',gT('Main survey menu'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,1]);
+        $returnArray[] = array_combine($headerArray, [3,null,null,null,3,0,'quickmenu',gT('Quick menu'),'collapsed',gT('Quick menu'),1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0,0]);
         App()->setLanguage($sOldLanguage);
 
         return $returnArray;

diff --git a/application/helpers/admin/export/HtmlWriter.php b/application/helpers/admin/export/HtmlWriter.php
@@ -109,7 +109,7 @@ protected function openTag($tag, $options = array())
         }
 
         /**
-         * Renders a question and recurses into sub-questions.
+         * Renders a question and recurses into subquestions.
          * @param Question $question
          * @param string $value
          */

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -2034,6 +2034,11 @@ function killSurveySession($iSurveyID)
     unset($_SESSION['survey_'.$iSurveyID]);
     // Force EM to refresh
     LimeExpressionManager::SetDirtyFlag();
+
+    //  unsetting LEMsingleton from session so new survey execution would start with new LEM instance
+    //  SetDirtyFlag() method doesn't reset LEM properly
+    //  this solution fixes bug: https://bugs.limesurvey.org/view.php?id=10162
+    unset($_SESSION["LEMsingleton"]);
 }
 
 /**

diff --git a/application/helpers/questionHelper.php b/application/helpers/questionHelper.php
@@ -124,7 +124,7 @@ public static function getAttributesDefinitions()
             'options'=>array(0=>gT('Hidden', 'unescaped'),
             1=>gT('Disabled', 'unescaped')),
             'default'=>0,
-            "help"=>gT("Specify how array-filtered sub-questions should be displayed"),
+            "help"=>gT("Specify how array-filtered subquestions should be displayed"),
             "caption"=>gT('Array filter style')
         );
 
@@ -324,8 +324,8 @@ public static function getAttributesDefinitions()
             'sortorder'=>220,
             'inputtype'=>'textarea',
             'expression'=>2,
-            "help"=>gT('Enter a boolean equation to validate each sub-question.'),
-            "caption"=>gT('Sub-question validation equation')
+            "help"=>gT('Enter a boolean equation to validate each subquestion.'),
+            "caption"=>gT('Subquestion validation equation')
         );
 
         self::$attributes["em_validation_sq_tip"] = array(
@@ -335,8 +335,8 @@ public static function getAttributesDefinitions()
             'inputtype'=>'textarea',
             'expression'=>1,
             'i18n'=>true,
-            "help"=>gT('This is a tip shown to the participant describing the sub-question validation equation.'),
-            "caption"=>gT('Sub-question validation tip')
+            "help"=>gT('This is a tip shown to the participant describing the subquestion validation equation.'),
+            "caption"=>gT('Subquestion validation tip')
         );
 
         self::$attributes["exclude_all_others"] = array(

diff --git a/application/views/admin/survey/Question/advanced_settings_view.php b/application/views/admin/survey/Question/advanced_settings_view.php
@@ -40,13 +40,16 @@
             <?php
                 echo $aAttribute['caption'];
                 if ($aAttribute['i18n']==true) { ?> (<?php echo $aAttribute['language'] ?>)<?php }
-            ?>:
+            ?>
+            <?php if (!empty($aAttribute['help'])): ?>
             <a class="text-primary show-help" data-toggle="collapse" href="#help<?php echo $aAttribute['name'];?>" aria-expanded="false" aria-controls="help<?php echo $aAttribute['name'];?>" aria-hidden=true>
                 <span class="fa fa-info-circle" ></span>
             </a>
+            <?php endif; ?>
         </label>
+        <?php if (!empty($aAttribute['help'])): ?>
         <p class="help-block collapse" id="help<?php echo $aAttribute['name'];?>"><?php echo $aAttribute['help'];?></p>
-
+        <?php endif; ?>
         <!-- Input -->
         <div class="">
             <?php

diff --git a/application/views/survey/questions/answer/arrays/dualscale/answer.twig b/application/views/survey/questions/answer/arrays/dualscale/answer.twig
@@ -80,7 +80,7 @@
     </thead>
 
     <tbody>
-        <!-- Loop all sub-questions -->
+        <!-- Loop all subquestions -->
         {% for ansrow in aSubQuestions %}
             <!-- Check for repeat headings -->
             {% if ansrow.repeatheadings %}