From b7ac4cd19d7431a6188d2e8829f53720191178a4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 6 Nov 2020 12:17:41 +0100
Subject: [PATCH] Exercises: Don't show category page in last question BT#17789

---
 main/exercise/exercise_submit.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main/exercise/exercise_submit.php b/main/exercise/exercise_submit.php
index 420c7b9404..01b833d644 100755
--- a/main/exercise/exercise_submit.php
+++ b/main/exercise/exercise_submit.php
@@ -660,7 +660,14 @@ if (api_get_configuration_value('block_category_questions') &&
 
         if ($count === $total) {
             $isLastQuestionInCategory = $categoryId;
+            if ($isLastQuestionInCategory) {
+                // This is the last question
+                if ((int) $current_question + 1 === count($questionList)) {
+                    $isLastQuestionInCategory = 0;
+                }
+            }
         }
+
         if (0 === $isLastQuestionInCategory) {
             $showPreviousButton = false;
         }