Fixes for the use of LIMIT in SQL for Postgres 7.3 (from Petri Asikainen)

diff --git a/lib/datalib.php b/lib/datalib.php
index b616b2292feb3027687a8421304414fcdd4d22f4..654d1ae6e77b156ab34d7c6a415d106537edb55b 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -811,11 +811,17 @@ function get_users_count() {
 function get_users_listing($sort, $dir="ASC", $page=1, $recordsperpage=20) {
     global $CFG;
 
-    if ($CFG->dbtype == "mysql") {
-        $limit = "LIMIT $page,$recordsperpage";
-    } else {
-        $limit = "LIMIT $recordsperpage,$page";
+    switch ($CFG->dbtype) {
+        case "mysql":
+             $limit = "LIMIT $page,$recordsperpage";
+             break;
+        case "postgres7":
+             $limit = "LIMIT $recordsperpage OFFSET ".($page * $recordsperpage);
+             break;
+        default: 
+             $limit = "LIMIT $recordsperpage,$page";
     }
+
     return get_records_sql("SELECT id, username, email, firstname, lastname, city, country, lastaccess  
                               FROM {$CFG->prefix}user 
                              WHERE username <> 'guest' 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 34ef8d66df372e5cf8d89c0c117185acfd850083..85d117566cf95a21d37b8422c2ae923d25023dfc 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -420,13 +420,17 @@ function forum_search_posts($search, $courseid, $page=0, $recordsperpage=50) {
         $notteacherforum = "";
     }
 
-    if ($CFG->dbtype == "mysql") {
-        $limit = "LIMIT $page,$recordsperpage";
-    } else {
-        $limit = "LIMIT $recordsperpage,$page";
+    switch ($CFG->dbtype) {
+        case "mysql":
+             $limit = "LIMIT $page,$recordsperpage";
+             break;
+        case "postgres7":
+             $limit = "LIMIT $recordsperpage OFFSET ".($page * $recordsperpage);
+             break;
+        default: 
+             $limit = "LIMIT $recordsperpage,$page";
     }
 
-
     return get_records_sql("SELECT p.*,u.firstname,u.lastname,u.email,u.picture
                             FROM {$CFG->prefix}forum_posts p,  
                                  {$CFG->prefix}forum_discussions d,