Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/exercise/exercise.class.php

@@ -8420,12 +8420,13 @@ class Exercise
     }
 
     /**
-     * Get array of exercise details and user results
+     * Get array of exercise details and user results.
+     *
      * @param int   $courseId
      * @param int   $sessionId
      * @param array $quizId
-     * @param bool $checkOnlyActiveUsers
-     * @param array $filterDates Limit the results exported to those within this range ('start_date' to 'end_date')
+     * @param bool  $checkOnlyActiveUsers
+     * @param array $filterDates          Limit the results exported to those within this range ('start_date' to 'end_date')
      *
      * @return array exercises
      */

main/exercise/exercise.php

@@ -131,6 +131,12 @@ $nameTools = get_lang('Exercises');
 // Simple actions
 if ($is_allowedToEdit) {
     switch ($action) {
+        case 'export_all_exercises_results':
+            $sessionId = api_get_session_id();
+            $courseId = api_get_course_int_id();
+            ExerciseLib::exportAllExercisesResultsZip($sessionId, $courseId);
+
+            break;
         case 'clean_all_test':
             if ($check) {
                 if (false === $allowClean) {
@@ -662,7 +668,7 @@ if ($is_allowedToEdit && $origin !== 'learnpath') {
 
     $actionsLeft .= Display::url(
         Display::return_icon('export_pdf.png', get_lang('ExportAllExercisesAllResults'), [], ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&action=export_all_exercises_results'
+        api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'&action=export_all_exercises_results'
     );
 
     if ($limitTeacherAccess) {

main/exercise/exercise_report.php

@@ -153,12 +153,6 @@ $objExerciseTmp = new Exercise();
 $exerciseExists = $objExerciseTmp->read($exercise_id);
 
 switch ($action) {
-    case 'export_all_exercises_results':
-        $sessionId = api_get_session_id();
-        $courseId = api_get_course_int_id();
-        ExerciseLib::exportAllExercisesResultsZip($sessionId, $courseId);
-
-        break;
     case 'export_all_results':
         $sessionId = api_get_session_id();
         $courseId = api_get_course_int_id();

main/inc/lib/exercise.lib.php

@@ -7299,7 +7299,7 @@ EOT;
             }
         }
 
-        if (!$exportOk) {
+        if (empty($mainPath) && !$exportOk) {
             Display::addFlash(
                 Display::return_message(
                     get_lang('ExportExerciseNoResult'),