[aur-dev] [PATCH 1/1] convert mysql specific offset/limit syntax to more standardized format

[elij]

---
 web/html/rss.php      |    2 +-
 web/html/tu.php       |    2 +-
 web/lib/acctfuncs.inc |    2 +-
 web/lib/pkgfuncs.inc  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/html/rss.php b/web/html/rss.php
index cb0bf40..0547815 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -32,7 +32,7 @@ $rss->image = $image;
 $dbh = db_connect();
 $q = "SELECT * FROM Packages ";
 $q.= "ORDER BY SubmittedTS DESC ";
-$q.= "LIMIT 0 , 20";
+$q.= "LIMIT 20";
 $result = db_query($q, $dbh);
 
 while ($row = mysql_fetch_assoc($result)) {
diff --git a/web/html/tu.php b/web/html/tu.php
index 941e6ed..dc1c5e3 100644
--- a/web/html/tu.php
+++ b/web/html/tu.php
@@ -119,7 +119,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") {
 		}
 
 		$order = ($by == 'asc') ? 'ASC' : 'DESC';
-		$lim = ($limit > 0) ? " LIMIT $off, $limit" : "";
+		$lim = ($limit > 0) ? " LIMIT $limit OFFSET $off" : "";
 		$by_next = ($by == 'desc') ? 'asc' : 'desc';
 
 		$q = "SELECT * FROM TU_VoteInfo WHERE End > " . time() . " ORDER BY Submitted " . $order;
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index fe1cfb1..f07c1fc 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -405,7 +405,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="",
 			break;
 	}
 	$search_vars[] = "SB";
-	$q.= "LIMIT ". $OFFSET . ", " . $HITS_PER_PAGE;
+	$q.= "LIMIT {$HITS_PER_PAGE} OFFSET {$OFFSET}";
 
 	$dbh = db_connect();
 
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 8f90d0e..25a09c4 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -501,7 +501,7 @@ function pkg_search_page($SID="") {
 		break;
 	}
 
-	$q_limit = "LIMIT ".$_GET["O"].", ".$_GET["PP"];
+	$q_limit = "LIMIT {$_GET["PP"]} OFFSET {$_GET["O"]}";
 
 	$q = $q_select . $q_from . $q_from_extra . $q_where . $q_sort . $q_limit;
 	$q_total = "SELECT COUNT(*) " . $q_from . $q_where;
-- 
1.7.4.1