Exercise - Hide "General" category when it is empty - refs BT#19525

main/exercise/exercise.class.php

@@ -10212,6 +10212,11 @@ class Exercise
             if (empty($tableRows)) {
                 return '';
             }
+
+            if (true === api_get_configuration_value('allow_exercise_categories') && empty($categoryId)) {
+                echo Display::page_subheader(get_lang('NoCategory'));
+            }
+
             $table->setTableData($tableRows);
             $table->setTotalNumberOfItems($total);
             $table->set_additional_parameters([

main/exercise/exercise.php

@@ -738,7 +738,6 @@ if (api_get_configuration_value('allow_exercise_categories') === false) {
     echo Exercise::exerciseGrid(0, $keyword);
 } else {
     if (empty($categoryId)) {
-        echo Display::page_subheader(get_lang('NoCategory'));
         echo Exercise::exerciseGrid(0, $keyword);
         $counter = 0;
         $manager = new ExerciseCategoryManager();