MDL-10873 If both site default and user pref are empty for studentsperpage, we assume...

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index b72f6c260d4940a8cfe09d59fa19e8fe42e407fb..4663028da819409598fbcb56cbc08dc710b6f804 100644 (file)
--- 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 c46dab48a3b3b7830b62f3fe3e6c69e3c54194dc..b4333d3aa0238f02fe98ba3e5cba919aa73471ff 100644 (file)
--- 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.'&perpage='.$this->get_pref('studentsperpage')
-                        .'&page='.$this->page.'&';
-        //
-        $this->pbarurl = 'index.php?id='.$this->courseid.'&perpage='.$this->get_pref('studentsperpage').'&';
+        $studentsperpage = $this->get_pref('studentsperpage');
+        $perpage = '';
+        $curpage = '';
+
+        if (!empty($studentsperpage)) {
+            $perpage = '&perpage='.$studentsperpage;
+            $curpage = '&page='.$this->page;
+        }
+        $this->baseurl = 'index.php?id='.$this->courseid. $perpage.$curpage.'&';
+
+        $this->pbarurl = 'index.php?id='.$this->courseid.$perpage.'&';
 
         // Setup groups if requested
         if ($this->get_pref('showgroups')) {