Moving deprecated uses of sql_paging_limit() to the new $limitfrom,

$limitnum parameters in all the get_recordXXX() functions. MDL-7167

Merged from MOODLE_17_STABLE

diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php
index 8aed12eb6613dc45ad5370fb0e681d60cc0ad5cc..893d692b77c717d6e8a7712153b53b141ed2e8b0 100644 (file)
--- a/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@ -41,11 +41,14 @@ class block_glossary_random extends block_base {
                 $this->instance_config_commit();
             }
 
+            $limitfrom = 0;
+            $limitnum = 1;
+
             switch ($this->config->type) {
 
                 case BGR_RANDOMLY:
                     $i = rand(1,$numberofentries);
-                    $LIMIT = sql_paging_limit($i-1, 1);
+                    $limitfrom = $i-1;
                     $SORT = 'ASC';
                     break;
 
@@ -58,13 +61,13 @@ class block_glossary_random extends block_base {
                     if ($i > $numberofentries) {  // Loop back to beginning
                         $i = 1;
                     }
-                    $LIMIT = sql_paging_limit($i-1, 1);
+                    $limitfrom = $i-1;
                     $SORT = 'ASC';
                     break;
 
                 default:  // BGR_LASTMODIFIED
                     $i = $numberofentries;
-                    $LIMIT = 'LIMIT 1';    // The last one
+                    $limitfrom = 0;
                     $SORT = 'DESC';
                     break;
             }
@@ -73,7 +76,7 @@ class block_glossary_random extends block_base {
                                          '    FROM '.$CFG->prefix.'glossary_entries'.
                                          '   WHERE glossaryid = '.$this->config->glossary.
                                          '     AND approved = 1 '.
-                                         'ORDER BY timemodified '.$SORT.' '.$LIMIT)) {
+                                         'ORDER BY timemodified '.$SORT, $limitfrom, $limitnum)) {
 
                 $entry = reset($entry);
 

diff --git a/blog/lib.php b/blog/lib.php
index 7f979fb3f945ea60d2af6de67bab96c8af13b839..e1424786340697166b3148b99762eba63b209d10 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -532,16 +532,18 @@
 
         }
 
+        $limitfrom = 0;
+        $limitnum = 0;
+
         if ($fetchstart !== '' && $limit) {
-            $limit = sql_paging_limit($fetchstart, $fetchlimit);
-        } else {
-            $limit = '';
+            $limitfrom = $fetchstart;
+            $limitnum = $fetchlimit;
         }
 
         $orderby = ' ORDER BY '. $sort .' ';
 
         //echo 'Debug: BlogFilter fetch_entries() sql="'. $SQL . $orderby . $limit .'"<br />'. $this->categoryid; //debug
-        $records = get_records_sql($SQL . $orderby . $limit);
+        $records = get_records_sql($SQL . $orderby, $limitfrom, $limitnum);
 
 //        print_object($records); //debug
 

diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 9ba32c7f4ec62cd9a1f3992a10fc1d120e215d79..ce559b9d81477413ae48d2a312e0409b85f05fc4 100644 (file)
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -276,11 +276,7 @@
         $table->initialbars($totalcount > $perpage);
         $table->pagesize($perpage, $matchcount);
 
-        if($table->get_page_start() !== '' && $table->get_page_size() !== '') {
-            $sql .= ' '.sql_paging_limit($table->get_page_start(), $table->get_page_size());
-        }
-
-        if (!$users = get_records_sql($sql)) {
+        if (!$users = get_records_sql($sql, $table->get_page_start(), $table->get_page_size())) {
             $users = array(); // tablelib will handle saying 'Nothing to display' for us.
         }
 

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 71ec8a705328828c7fe7f85757e07c8754e53c69..43ff0675396afa6cdfc3fdc4dfe1ab70dae05017 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -146,14 +146,8 @@ function authorize_print_orders($courseid, $userid)
     $totalcount = count_records_sql('SELECT COUNT(*) ' . $from . $where);
     $table->initialbars($totalcount > $perpage);
     $table->pagesize($perpage, $totalcount);
-    if ($table->get_page_start() !== '' && $table->get_page_size() !== '') {
-        $limit = ' ' . sql_paging_limit($table->get_page_start(), $table->get_page_size());
-    }
-    else {
-        $limit = '';
-    }
 
-    if ($records = get_records_sql($select . $from . $where . $sort . $limit)) {
+    if ($records = get_records_sql($select . $from . $where . $sort, $table->get_page_start(), $table->get_page_size())) {
         foreach ($records as $record) {
             $actionstatus = authorize_get_status_action($record);
             $color = authorize_get_status_color($actionstatus->status);

diff --git a/lib/datalib.php b/lib/datalib.php
index 8fbefbac2a8b4f5b3ded77a05927d41587e85c77..9d286ebea4229c5e191c8a984ebbbd8c8dca57a1 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -260,11 +260,6 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp
 
     global $CFG;
 
-    if ($recordsperpage) {
-        $limit = sql_paging_limit($page, $recordsperpage);
-    } else {
-        $limit = '';
-    }
     $LIKE      = sql_ilike();
     $fullname  = sql_fullname();
 
@@ -290,7 +285,7 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp
 /// warning: will return UNCONFIRMED USERS
     return get_records_sql("SELECT id, username, email, firstname, lastname, city, country, lastaccess, confirmed
                               FROM {$CFG->prefix}user
-                             WHERE $select $sort $limit ");
+                             WHERE $select $sort", $page, $recordsperpage);
 
 }
 
@@ -704,8 +699,6 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
 
     global $CFG;
 
-    $limit = sql_paging_limit($page, $recordsperpage);
-
     //to allow case-insensitive search for postgesql
     if ($CFG->dbtype == 'postgres7') {
         $LIKE = 'ILIKE';
@@ -749,7 +742,7 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
 
     $totalcount = count_records_sql('SELECT COUNT(*) FROM '. $selectsql);
 
-    $courses = get_records_sql('SELECT * FROM '. $selectsql .' ORDER BY '. $sort .' '. $limit);
+    $courses = get_records_sql('SELECT * FROM '. $selectsql .' ORDER BY '. $sort, $page, $recordsperpage);
 
     if ($courses) {  /// Remove unavailable courses from the list
         foreach ($courses as $key => $course) {

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 2a301a8016d087046aa47273eaa888b324269429..850e644911a9f1cf9949ed1f177e897ab79e348e 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -843,10 +843,8 @@ class assignment_base {
             $sort = 'ORDER BY '.$sort.' ';
         }
 
-        $limit = sql_paging_limit($offset+1, 1);
-
         $nextid = 0;
-        if (($auser = get_record_sql($select.$sql.$sort.$limit, false, true)) !== false) {
+        if (($auser = get_records_sql($select.$sql.$sort, $offset+1, 1)) !== false) {
             $nextid = $auser->id;
         }
 
@@ -1100,13 +1098,6 @@ class assignment_base {
     
         $table->pagesize($perpage, count($users));
         
-        if($table->get_page_start() !== '' && $table->get_page_size() !== '') {
-            $limit = ' '.sql_paging_limit($table->get_page_start(), $table->get_page_size());     
-        }
-        else {
-            $limit = '';
-        }
-    
         ///offset used to calculate index of student in that particular query, needed for the pop up to know who's next
         $offset = $page * $perpage;
         
@@ -1114,7 +1105,7 @@ class assignment_base {
         $strgrade  = get_string('grade');
         $grademenu = make_grades_menu($this->assignment->grade);
 
-        if (($ausers = get_records_sql($select.$sql.$sort.$limit)) !== false) {
+        if (($ausers = get_records_sql($select.$sql.$sort, $table->get_page_start(), $table->get_page_size())) !== false) {
             
             foreach ($ausers as $auser) {
                 $picture = print_user_picture($auser->id, $course->id, $auser->picture, false, true);