From 5013658875c2433aef4440314696ad267ee0b616 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Mon, 23 Jul 2012 09:54:17 +0200
Subject: [PATCH] Fixed issue #6347: display of question text different in
 1.92+ and 2.0 when view question in admin mode Dev Partial fix

---
 application/core/Survey_Common_Action.php                 | 1 -
 .../views/admin/survey/Question/questionbar_view.php      | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index 1fc861e70e9..1480b31a3a8 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -352,7 +352,6 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null)
         foreach ($qrresult as $qrrow)
         {
             $qrrow = $qrrow->attributes;
-            $qrrow = array_map('flattenText', $qrrow);
             if (hasSurveyPermission($iSurveyId, 'surveycontent', 'read'))
             {
                 if (count(Survey::model()->findByPk($iSurveyId)->additionalLanguages) != 0)
diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php
index cb969b139f9..571f563af81 100644
--- a/application/views/admin/survey/Question/questionbar_view.php
+++ b/application/views/admin/survey/Question/questionbar_view.php
@@ -166,20 +166,20 @@
             <?php $clang->eT("Question:"); ?></strong></td><td>
             <?php
                 templatereplace($qrrow['question']);
-                echo LimeExpressionManager::GetLastPrettyPrintExpression();
+                echo FlattenText(LimeExpressionManager::GetLastPrettyPrintExpression(), true);
         ?></td></tr>
     <tr><td><strong>
             <?php $clang->eT("Help:"); ?></strong></td><td>
             <?php
                 if (trim($qrrow['help'])!=''){
                     templatereplace($qrrow['help']);
-                    echo LimeExpressionManager::GetLastPrettyPrintExpression();
+                    echo FlattenText(LimeExpressionManager::GetLastPrettyPrintExpression(), true);
             } ?>
         </td></tr>
     <?php if ($qrrow['preg'])
         { ?>
         <tr ><td><strong>
-                <?php $clang->eT("Validation:"); ?></strong></td><td><?php echo $qrrow['preg']; ?>
+                <?php $clang->eT("Validation:"); ?></strong></td><td><?php echo htmlspecialchars($qrrow['preg']); ?>
             </td></tr>
         <?php } ?>
 
@@ -252,7 +252,7 @@
         <tr>
             <td><?php echo $aAdvancedSetting['caption'];?>:</td>
             <td><?php
-                    if ($aAdvancedSetting['i18n']==false)  echo $aAdvancedSetting['value']; else echo $aAdvancedSetting[$baselang]['value']?>
+                    if ($aAdvancedSetting['i18n']==false)  echo htmlspecialchars($aAdvancedSetting['value']); else echo htmlspecialchars($aAdvancedSetting[$baselang]['value'])?>
             </td>
         </tr>
         <?php } ?>