From caedf5f010f728ff0cd63367d0225942f4e7a1cd Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Thu, 12 Dec 2013 23:53:17 +0100
Subject: [PATCH] Dev Speed optimizations when browsing responses

---
 application/controllers/admin/responses.php                 | 2 +-
 application/views/admin/responses/browseallrow_view.php     | 3 +--
 application/views/admin/responses/browsetimeheader_view.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
index 594026c89d2..6bdc2d54d70 100644
--- a/application/controllers/admin/responses.php
+++ b/application/controllers/admin/responses.php
@@ -479,7 +479,7 @@ function browse($iSurveyID)
                         $question .=' (' . $fielddetails['subquestion1'] . ':' . $fielddetails['subquestion2'] . ')';
                     if (isset($fielddetails['scale_id']))
                         $question .='[' . $fielddetails['scale'] . ']';
-                    $fnames[] = array($fielddetails['fieldname'], flattenText(stripJavaScript($question), true));
+                    $fnames[] = array($fielddetails['fieldname'], flattenText($question,true));
                 }
                 elseif ($fielddetails['aid'] !== 'filecount')
                 {
diff --git a/application/views/admin/responses/browseallrow_view.php b/application/views/admin/responses/browseallrow_view.php
index cf431fa3295..ef99b2d8bee 100644
--- a/application/views/admin/responses/browseallrow_view.php
+++ b/application/views/admin/responses/browseallrow_view.php
@@ -6,8 +6,7 @@
 { ?>
 <a href='<?php echo $this->createUrl("admin/dataentry/sa/editdata/subaction/edit/surveyid/{$surveyid}/id/{$dtrow['id']}"); ?>'><img src='<?php echo $sImageURL; ?>edit_16.png' alt='<?php $clang->eT('Edit this response'); ?>'/></a>
 <?php }
-if (hasFileUploadQuestion($surveyid))
-{ ?>
+if ($bHasFileUploadQuestion) { ?>
 <a><img id='downloadfile_<?php echo $dtrow['id']; ?>' src='<?php echo $sImageURL; ?>down.png' alt='<?php $clang->eT('Download all files in this response as a zip file'); ?>' class='downloadfile'/></a>
 <?php }
 if (Permission::model()->hasSurveyPermission($surveyid, 'responses', 'delete'))
diff --git a/application/views/admin/responses/browsetimeheader_view.php b/application/views/admin/responses/browsetimeheader_view.php
index db72921a98d..1a6ec904418 100644
--- a/application/views/admin/responses/browsetimeheader_view.php
+++ b/application/views/admin/responses/browsetimeheader_view.php
@@ -71,7 +71,7 @@
                 }
             ?>
             <th class='<?php echo $gbc; ?>'>
-                <strong><?php echo flattenText(stripJavaScript($fn[1]), true); ?></strong>
+                <strong><?php echo flattenText($fn[1], true); ?></strong>
             </th>
             <?php } ?>
     </tr>