Merge branch 'master' into develop

LimeSurvey · Nov 8, 2018 · 73102c3 · 73102c3
2 parents 58a4794 + 26dba20
commit 73102c3
Show file tree

Hide file tree

Showing 17 changed files with 220 additions and 190 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -16,5 +16,5 @@
 $config['dbversionnumber'] = 403;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = '30065';
+$config['assetsversionnumber'] = '30066';
 return $config;
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -641,7 +641,7 @@ public function vvexport()
                 if (count($fielddata) < 1) {
                     $firstline .= $field;
                 } else {
-                    $firstline .= preg_replace('/\s+/', ' ', strip_tags($fielddata['question']));
+                    $firstline .= preg_replace('/\s+/', ' ', flattenText($fielddata['question'],false,true,'UTF-8',true));
                 }
                 $firstline .= $s;
                 if ($vvVersion == 2) {

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -326,7 +326,14 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
 
         if ($sRenderFile == false) {
             if (!empty($aData['surveyid'])) {
+
                 $aData['oSurvey'] = Survey::model()->findByPk($aData['surveyid']);
+
+                // Needed to evaluate EM expressions in question summary
+                // See bug #11845
+                LimeExpressionManager::SetSurveyId($aData['surveyid']);
+                LimeExpressionManager::StartProcessingPage(false,true);
+
                 $renderFile = $basePath.'/layout_insurvey.php';
             } else {
                 $renderFile = $basePath.'/layout_main.php';

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -2285,8 +2285,9 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
 
             $aIdMap = [];
             $aDefaultSurveyMenus = LsDefaultDataSets::getSurveyMenuData();
-            foreach($aDefaultSurveyMenus as $i => $aSurveymenu) {
+            foreach ($aDefaultSurveyMenus as $i => $aSurveymenu) {
                 $oDB->createCommand()->delete('{{surveymenu}}', 'name=:name', [':name' => $aSurveymenu['name']]);
+                $oDB->createCommand()->delete('{{surveymenu}}', 'id=:id', [':id' => $aSurveymenu['id']]);
                 $oDB->createCommand()->insert('{{surveymenu}}', $aSurveymenu);
                 $aIdMap[$aSurveymenu['name']] = $oDB->getCommandBuilder()->getLastInsertID('{{surveymenu}}');
             }

diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php
@@ -53,7 +53,7 @@ class='btn btn-default pull-right condition-header-button'
 
 <?php echo $conditionsoutput_action_error;?>
 <?php App()->getClientScript()->registerScript("conditionshead_prepared_javascript", $javascriptpre, LSYii_ClientScript::POS_BEGIN);?>
-<?php App()->getClientScript()->registerScript("conditionshead_onrun_javascript", 'doToolTip();', LSYii_ClientScript::POS_POSTSCRIPT);?>
+<?php App()->getClientScript()->registerScript("conditionshead_onrun_javascript", 'window.LS.doToolTip();', LSYii_ClientScript::POS_POSTSCRIPT);?>
 
 <!-- Modal for quick add -->
 <div id="quick-add-condition-modal" class="modal fade" role="dialog">

diff --git a/assets/scripts/admin/conditions.js b/assets/scripts/admin/conditions.js
@@ -248,6 +248,11 @@ populateCanswersSelectObject = function() {
 
     this.fun = function(evt) {
 
+        // preselect the first option if select object value is null
+        if ($(that.cquestionsId).val() === null){
+            $(that.cquestionsId+" option:first").attr('selected','selected');
+        }
+
         var fname = $(that.cquestionsId).val();
         // empty the canswers Select
         $(that.canswersId + ' option').remove();

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -35,6 +35,23 @@ Thank you to everyone who helped with this new release!
 CHANGE LOG
 ------------------------------------------------------
 
+
+Changes from 3.15.2 (build 181107) to 3.15.3 (build 181018)   November 08, 2018
+-Fixed issue #11845: Relevance Equation code is missing syntax highlighting and not recognising question variables (Dominik Vitt)
+-Fixed issue #14211 : no keyboard navigation available with language changer (Denis Chenu)
+-Fixed issue: Condition designer doesn't show predefined answers on first load (Dominik Vitt)
+-Fixed issue: Selected survey language for browsing responses was not used in detail view or queXML PDF view (Carsten Schmitz)
+-Fixed issue: Update not possible from pre 3.x versions (Carsten Schmitz)
+#Updated translation: German (Informal) by c_schmitz
+#Updated translation: German by c_schmitz
+#Updated translation: Italian (Informal) by lfanfoni
+#Updated translation: Italian by lfanfoni
+#Updated translation: Japanese by nomoto
+#Updated translation: Norwegian (Bokmål) by pmonstad
+#Updated translation: Papiamento (Curaçao and Bonaire) by c_schmitz
+#Updated translation: Romanian by cdorin
+
+
 Changes from 3.15.1 (build 181017) to 3.15.2 (build 181107)  November 07, 2018
 
 -New feature: allow to change config file location (LouisGac)