MDL-19794 Converted calls to print_paging_bar

diff --git a/course/category.php b/course/category.php
index 31653847588d6b881491dd0a572b8f752d17eac7..7f1f1ad8d828c18bb33b7b1ca90e79b413cfdd17 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -235,7 +235,7 @@
         print_box_end();
 
     } else {
-        print_paging_bar($totalcount, $page, $perpage, "category.php?id=$category->id&perpage=$perpage&");
+        echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "category.php?id=$category->id&perpage=$perpage"));
 
         $strcourses = get_string('courses');
         $strselect = get_string('select');

diff --git a/course/lib.php b/course/lib.php
index 0146ee9da43c7fbf3783dbd462d81634d1559707..894f8719af99e82ce9d24cc90ebc90feeb7b0bf9 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -304,7 +304,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
     print_string("displayingrecords", "", $totalcount);
     echo "</div>\n";
 
-    print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
+    echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "$url&perpage=$perpage"));
 
     echo '<table class="logtable generalbox boxaligncenter" summary="">'."\n";
     // echo "<table class=\"logtable\" cellpadding=\"3\" cellspacing=\"0\" summary=\"\">\n";
@@ -384,7 +384,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
     }
     echo "</table>\n";
 
-    print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
+    echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "$url&perpage=$perpage"));
 }
 
 
@@ -421,7 +421,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
     print_string("displayingrecords", "", $totalcount);
     echo "</div>\n";
 
-    print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
+    echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "$url&perpage=$perpage"));
 
     echo "<table class=\"logtable\" cellpadding=\"3\" cellspacing=\"0\">\n";
     echo "<tr>";
@@ -487,7 +487,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
     }
     echo "</table>\n";
 
-    print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
+    echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "$url&perpage=$perpage"));
 }
 
 

diff --git a/course/search.php b/course/search.php
index 0a90e3ab1f90f0befc320ac3c7dfa0511e13ef9f..d3b84de0a5686d9cbacde8ad02b90eac67a36324 100644 (file)
--- a/course/search.php
+++ b/course/search.php
@@ -372,7 +372,10 @@
      * @param string $modulelink - module name
      */
     function print_navigation_bar($totalcount,$page,$perpage,$encodedsearch,$modulelink) {
-        print_paging_bar($totalcount, $page, $perpage, "search.php?search=$encodedsearch".$modulelink."&perpage=$perpage&",'page',($perpage == 99999));
+        global $OUTPUT;
+        $pagingbar = moodle_paging_bar::make($totalcount, $page, $perpage, "search.php?search=$encodedsearch".$modulelink."&perpage=$perpage");
+        $pagingbar->nocurr = ($perpage == 99999);
+        echo $OUTPUT->paging_bar($pagingbar);
 
         //display
         if ($perpage != 99999 && $totalcount > $perpage) {