Fixed issue #10091: don't load groupdescription.pstl if no group desc

LimeSurvey · Dec 9, 2015 · 4f0689b · 4f0689b
1 parent 7944236
commit 4f0689b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1084,7 +1084,7 @@ function run($surveyid,$args)
             echo templatereplace(file_get_contents($sTemplatePath."startgroup.pstpl"), array(), $redata);
             echo "\n";
 
-            if (!$previewquestion)
+            if (!$previewquestion && !empty($redata['groupdescription']))
             {
                 echo templatereplace(file_get_contents($sTemplatePath."groupdescription.pstpl"), array(), $redata);
             }
@@ -1258,13 +1258,13 @@ public function setJavascriptVar($iSurveyId)
 
     /**
     * Construction of replacement array, actually doing it with redata
-    * 
+    *
     * @param $aQuestionQanda : array from qanda helper
     * @return aray of replacement for question.psptl
     **/
     public static function getQuestionReplacement($aQuestionQanda)
     {
-        
+
         // Get the default replacement and set empty value by default
         $aReplacement=array(
             "QID"=>"",
@@ -1298,7 +1298,7 @@ public static function getQuestionReplacement($aQuestionQanda)
         $oSurveyId=Survey::model()->findByPk($iSurveyId);
         $sType=$lemQuestionInfo['info']['type'];
 
-        // Core value : not replaced 
+        // Core value : not replaced
         $aReplacement['QID']=$iQid;
         $aReplacement['GID']=$aQuestionQanda[6];// Not sure for aleatory : it's the real gid or the updated gid ? We need original gid or updated gid ?
         $aReplacement['SGQ']=$aQuestionQanda[7];

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -4754,9 +4754,7 @@ function do_array($ia)
         }
         $cellwidth = round( ($columnswidth / $numrows ) , 1 );
 
-
-/////////////////////////////////////// /////////////////////
-        $answer_start .= '<div class="no-more-tables">';
+        $answer_start = '<div class="no-more-tables">';
         $answer_start .= "\n<table class=\"table-in-qanda-5 question subquestions-list questions-list {$extraclass}\" summary=\"{$caption}\">\n";
         $answer_head_line= "\t<td>&nbsp;</td>\n";
             foreach ($labelans as $ld)