From c83beb62b391bb4d6cb8a6837906b0d7fa0b025a Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 2 May 2014 13:47:29 +0200 Subject: [PATCH] Fixed issue #9016: Redundant "File count" text before actual value displayed in response records --- application/controllers/admin/responses.php | 2 +- application/helpers/common_helper.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php index 52c849bb6af..c21b1e2a7f9 100644 --- a/application/controllers/admin/responses.php +++ b/application/controllers/admin/responses.php @@ -489,7 +489,7 @@ function browse($iSurveyID) } else { - $fnames[] = array($fielddetails['fieldname'], $clang->gT("File count")); + $fnames[] = array($fielddetails['fieldname'], $clang->gT("File count"), 'code'=>viewHelper::getFieldCode($fielddetails)); } } diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php index a2fc4b55c9e..9b1f2769347 100644 --- a/application/helpers/common_helper.php +++ b/application/helpers/common_helper.php @@ -1758,9 +1758,7 @@ function getExtendedAnswer($iSurveyID, $sFieldCode, $sValue, $oLanguage) } break; case "|": //File upload - if (substr($sFieldCode, -9) == 'filecount') { - $this_answer = $oLanguage->gT("File count"); - } else { + if (substr($sFieldCode, -9) != 'filecount') { //Show the filename, size, title and comment -- no link! $files = json_decode($sValue); $sValue = '';