From 72a054b9f9a62bca3eed664b5393dd47ab253d8a Mon Sep 17 00:00:00 2001
From: gustav_delius <gustav_delius>
Date: Wed, 1 Jun 2005 20:07:50 +0000
Subject: [PATCH] Fixed bug 3393

---
 mod/quiz/edit.php    |  2 ++
 mod/quiz/editlib.php | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 6fea7ce5c04..885ad92edf4 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -341,6 +341,8 @@ if (self.name == 'editquestion') {
 
     if (isset($_REQUEST['cat'])) { /// coming from category selection drop-down menu
         $modform->category = $cat;
+        $page = 0;
+        $modform->page = 0;
     }
 
     if(isset($_REQUEST['recurse'])) {
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index fcd35658fa8..d2f52b9b757 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -525,10 +525,15 @@ function quiz_print_cat_question_list($course, $categoryid, $quizselected=true,
     }
 
     if (!$questions = get_records_select('quiz_questions', "category IN ($categorylist) AND parent = '0' $showhidden", 'qtype, name ASC', '*', $page*$perpage, $perpage)) {
-        echo "<p align=\"center\">";
-        print_string("noquestions", "quiz");
-        echo "</p>";
-        return;
+        // There are no questions on the requested page.
+        $page = 0;
+        if (!$questions = get_records_select('quiz_questions', "category IN ($categorylist) AND parent = '0' $showhidden", 'qtype, name ASC', '*', 0, $perpage)) {
+            // There are no questions at all
+            echo "<p align=\"center\">";
+            print_string("noquestions", "quiz");
+            echo "</p>";
+            return;
+        }
     }
 
     print_paging_bar($totalnumber, $page, $perpage,