From 09cef06a102bb675df61384dae30e37e74a1618c Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Thu, 16 Aug 2007 18:09:49 +0000
Subject: [PATCH] MDL-10873 If both site default and user pref are empty for
 studentsperpage, we assume that paging is not wanted, so all paging
 functionality is switched off in the report.

---
 grade/report/grader/index.php | 10 +++++++---
 grade/report/grader/lib.php   | 15 +++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index b72f6c260d..4663028da8 100644
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -151,7 +151,11 @@ echo $report->group_selector;
 echo '<div class="clearer"></div>';
 
 echo $report->get_toggles_html();
-print_paging_bar($numusers, $report->page, $report->get_pref('studentsperpage'), $report->pbarurl);
+$studentsperpage = $report->get_pref('studentsperpage');
+// Don't use paging if studentsperpage is empty or 0 at course AND site levels
+if (!empty($studentsperpage)) {
+    print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
+}
 
 $reporthtml = '<table class="gradestable flexible boxaligncenter generaltable">';
 $reporthtml .= $report->get_headerhtml();
@@ -179,8 +183,8 @@ if ($USER->gradeediting[$course->id] && ($report->get_pref('quickfeedback') || $
 }
 
 // prints paging bar at bottom for large pages
-if ($report->get_pref('studentsperpage') >= 20) {
-    print_paging_bar($numusers, $report->page, $report->get_pref('studentsperpage'), $report->pbarurl);
+if (!empty($studentsperpage) && $studentsperpage >= 20) {
+    print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
 }
 
 print_footer($course);
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index c46dab48a3..b4333d3aa0 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -94,10 +94,17 @@ class grade_report_grader extends grade_report {
         $this->sortitemid = $sortitemid;
 
         // base url for sorting by first/last name
-        $this->baseurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage')
-                        .'&amp;page='.$this->page.'&amp;';
-        //
-        $this->pbarurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage').'&amp;';
+        $studentsperpage = $this->get_pref('studentsperpage');
+        $perpage = '';
+        $curpage = '';
+
+        if (!empty($studentsperpage)) {
+            $perpage = '&amp;perpage='.$studentsperpage;
+            $curpage = '&amp;page='.$this->page;
+        }
+        $this->baseurl = 'index.php?id='.$this->courseid. $perpage.$curpage.'&amp;';
+
+        $this->pbarurl = 'index.php?id='.$this->courseid.$perpage.'&amp;';
 
         // Setup groups if requested
         if ($this->get_pref('showgroups')) {
-- 
2.39.5