Fixing exercise category title see #5576

main/exercice/exercise.lib.php

@@ -2173,12 +2173,9 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
     
             $question_content = '<div class="question_row">';
 
-            if ($show_results) {           
+            if ($show_results) {
                 //Shows question title an description
-                $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-                
-                // display question category, if any
-                $question_content .= Testcategory::returnCategoryAndTitle($questionId);
+                $question_content .= $objQuestionTmp->return_header(null, $counter, $score);                
             }
             $counter++;
             

main/exercice/exercise_result.php

@@ -133,6 +133,7 @@ if ($objExercise->selectAttempts() > 0) {
 
 Display :: display_normal_message(get_lang('Saved').'<br />',false);
 
+//Display questions
 display_question_list_by_attempt($objExercise, $exe_id, true);
 
 //If is not valid

main/exercice/exercise_show.php

@@ -614,13 +614,9 @@ foreach ($questionList as $questionId) {
     $question_content = '<div class="question_row">';
     
  	if ($show_results) { 	    
-        //Shows question title an description        
-	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-        
-        // display question category, if any
- 	    $question_content .= Testcategory::returnCategoryAndTitle($questionId);
-	}
-    
+        //Shows question title an description
+	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);        
+	}    
 	$counter++;    
     $question_content .= $contents;
     $question_content .= '</div>';   

main/exercice/question.class.php

@@ -1395,9 +1395,13 @@ abstract class Question
             }            
         }        
         $question_title = $this->question;
-        $header = Display::page_subheader2($counter_label.". ".$question_title);
+        
+        // display question category, if any
+        $header = Testcategory::returnCategoryAndTitle($this->id);
+                
+        $header .= Display::page_subheader2($counter_label.". ".$question_title);
         //$header .=  Display::div('<div class="rib rib-'.$class.'"><h3>'.$score_label.'</h3></div> <h4>'.($score['result']).' </h4><h5 class="'.$class.'">'.$score['result'].' </h5>', array('class'=>'ribbon'));        
-	    $header .=  Display::div('<div class="rib rib-'.$class.'"><h3>'.$score_label.'</h3></div> <h4>'.$score['result'].' </h4>', array('class'=>'ribbon'));        
+	    $header .= Display::div('<div class="rib rib-'.$class.'"><h3>'.$score_label.'</h3></div> <h4>'.$score['result'].' </h4>', array('class'=>'ribbon'));        
 	    $header .= Display::div($this->description, array('id'=>'question_description'));	    
         return $header;
 	}