From 4a97af59ef437cd7767b5e3cd63e6ce7e26b265b Mon Sep 17 00:00:00 2001
From: Eric Merrill <merrill@oakland.edu>
Date: Wed, 8 Jul 2015 17:17:02 -0400
Subject: [PATCH] MDL-50799 question: Improve Show all text to be more accurate

---
 question/classes/bank/view.php | 9 +++++++--
 question/editlib.php           | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/question/classes/bank/view.php b/question/classes/bank/view.php
index cc93016b6dc42..d4334ca09c3b3 100644
--- a/question/classes/bank/view.php
+++ b/question/classes/bank/view.php
@@ -710,8 +710,13 @@ protected function display_question_list($contexts, $pageurl, $categoryandcontex
         echo $OUTPUT->render($pagingbar);
         if ($totalnumber > DEFAULT_QUESTIONS_PER_PAGE) {
             if ($perpage == DEFAULT_QUESTIONS_PER_PAGE) {
-                $url = new \moodle_url('edit.php', array_merge($pageurl->params(), array('qperpage' => 1000)));
-                $showall = '<a href="'.$url.'">'.get_string('showall', 'moodle', $totalnumber).'</a>';
+                $url = new \moodle_url('edit.php', array_merge($pageurl->params(),
+                        array('qperpage' => MAXIMUM_QUESTIONS_PER_PAGE)));
+                if ($totalnumber > MAXIMUM_QUESTIONS_PER_PAGE) {
+                    $showall = '<a href="'.$url.'">'.get_string('showperpage', 'moodle', MAXIMUM_QUESTIONS_PER_PAGE).'</a>';
+                } else {
+                    $showall = '<a href="'.$url.'">'.get_string('showall', 'moodle', $totalnumber).'</a>';
+                }
             } else {
                 $url = new \moodle_url('edit.php', array_merge($pageurl->params(),
                                               array('qperpage' => DEFAULT_QUESTIONS_PER_PAGE)));
diff --git a/question/editlib.php b/question/editlib.php
index ff7800dab8418..922bc6728597f 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -31,6 +31,7 @@
 require_once($CFG->libdir . '/questionlib.php');
 
 define('DEFAULT_QUESTIONS_PER_PAGE', 20);
+define('MAXIMUM_QUESTIONS_PER_PAGE', 1000);
 
 function get_module_from_cmid($cmid) {
     global $CFG, $DB;