MDL-19787 Converted calls to print_paging_bar

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index b56f060bbd152b496e3d631ae4366395fbcd0aac..defce6c897ccb4c98a27c9fd7949e44030cbd29e 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -185,7 +185,9 @@ if (!$acl) {
 if (!empty($table)) {
     print_table($table);
     echo '<p>&nbsp;</p>';
-    print_paging_bar($aclcount, $page, $perpage, "?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;");
+    $baseurl = new moodle_url(null, array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
+    $pagingbar = moodle_paging_bar::make($aclcount, $page, $perpage, $baseurl);
+    echo $OUTPUT->paging_bar($pagingbar);
 }
 
 

diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php
index 0d0261a8be0092444288e01d65978faea48853e5..869644400cd89749eaef6a40b5ae1536b2e82767 100644 (file)
--- a/admin/report/configlog/index.php
+++ b/admin/report/configlog/index.php
@@ -52,7 +52,8 @@ foreach ($columns as $column=>$strcolumn) {
     $hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon";
 }
 
-print_paging_bar($changescount, $page, $perpage, "index.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;");
+$baseurl = new moodle_url('index.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
+echo $OUTPUT->paging_bar(moodle_paging_bar::make($changescount, $page, $perpage, $baseurl));
 
 $override = new object();
 $override->firstname = 'firstname';

diff --git a/admin/user.php b/admin/user.php
index f2aae56ca8570413f9662b1cef9b30b8d7a55f61..a6a3ad4488d6d5c716dec0879aac3209ece3a70a 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -164,9 +164,9 @@
 
     $alphabet = explode(',', get_string('alphabet'));
     $strall = get_string('all');
-
-    print_paging_bar($usercount, $page, $perpage,
-            "user.php?sort=$sort&dir=$dir&perpage=$perpage&");
+    
+    $baseurl = new moodle_url('user.php', array('sort' => $sort, 'dir' => $dir, 'perpage' => $perpage));
+    echo $OUTPUT->paging_bar(moodle_paging_bar::make($usercount, $page, $perpage, $baseurl));
 
     flush();
 
@@ -297,8 +297,7 @@
     }
     if (!empty($table)) {
         print_table($table);
-        print_paging_bar($usercount, $page, $perpage,
-                         "user.php?sort=$sort&dir=$dir&perpage=$perpage&");
+        echo $OUTPUT->paging_bar(moodle_paging_bar::make($usercount, $page, $perpage, $baseurl));
         if (has_capability('moodle/user:create', $sitecontext)) {
             echo $OUTPUT->heading('<a href="'.$securewwwroot.'/user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
         }