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

…o answers_html
LimeSurvey · Nov 1, 2016 · 652bbdf · 652bbdf
2 parents e34e2df + f3fe182
commit 652bbdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -2013,7 +2013,8 @@ protected function getEditFormJavascript($subaction)
             }
             elseif (is_array($request->getPost('EDITcanswers'))) { // was a predefined answers post
                 $aViewUrls['output'] .= "\tdocument.getElementById('editTargetTab').value='#CANSWERSTAB';\n";
-                $aViewUrls['output'] .= "\t$('#canswersToSelect').val('".$request->getPost('EDITcanswers')[0]."');\n";
+                $EDITcanswers = $request->getPost('EDITcanswers');
+                $aViewUrls['output'] .= "\t$('#canswersToSelect').val('".$EDITcanswers[0]."');\n";
             }
 
             if ($request->getPost('csrctoken') != '') {

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -256,6 +256,10 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
         {
             $aData['oSurvey'] = Survey::model()->findByPk($aData['surveyid']);
 
+            // Needed to evaluate EM expressions in question summary
+            // See bug #11845
+            LimeExpressionManager::StartProcessingPage(false,true);
+
             $this->_titlebar($aData);
 
             //// Each view will call the correct bar as a subview.