Merged fixes for MDL-7425 from 1.8 stable

diff --git a/course/category.php b/course/category.php
index 25f02d240f5d6327f80086574a38a2d86bd1556f..dc7cbb2c4ae927bce8018cf278768941edb0bcae 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -342,7 +342,11 @@
         // be moved up and down beyond the paging border
         if ($totalcount > $perpage) {
             $atfirstpage = ($page == 0);
-            $atlastpage = (($page + 1) == ceil($totalcount / $perpage));
+            if ($perpage > 0) {
+                $atlastpage = (($page + 1) == ceil($totalcount / $perpage));
+            } else {
+                $atlastpage = true;
+            }
         } else {
             $atfirstpage = true;
             $atlastpage = true;

diff --git a/lib/weblib.php b/lib/weblib.php
index 84e327cbd5b1803298ac7df22c8505b2496bf271..032076c9bcf782409c9180cdfe37d70f6a91eb2b 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -5665,7 +5665,11 @@ function print_paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar='page
                 $output .= '&nbsp;(<a href="'. $baseurl->out(false, array($pagevar => $pagenum)).'">'. get_string('previous') .'</a>)&nbsp;';
             }
         }
-        $lastpage = ceil($totalcount / $perpage);
+        if ($perpage > 0) {
+            $lastpage = ceil($totalcount / $perpage);
+        } else {
+            $lastpage = 1;
+        }
         if ($page > 15) {
             $startpage = $page - 10;
             if (!is_a($baseurl, 'moodle_url')){