From 44564b01d07b0241cf4d5ea66f432b11051017df Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Thu, 8 May 2008 15:50:53 +0000 Subject: [PATCH] (bug 14042) Calling Database::limitResult() misplaced the comment in the log file --- RELEASE-NOTES | 1 + includes/Database.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index a24823015d..88ef81e902 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -261,6 +261,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 13615) Update case mappings and normalization to Unicode 5.1.0 Note that case mappings will only be used if mbstring extension is not present. * (bug 14044) Don't increment page view counters on views from bot users +* (bug 14042) Calling Database::limitResult() misplaced the comment in the log file === API changes in 1.13 === diff --git a/includes/Database.php b/includes/Database.php index b702038018..b9b4502224 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -1668,7 +1668,7 @@ class Database { if( !is_numeric($limit) ) { throw new DBUnexpectedError( $this, "Invalid non-numeric limit passed to limitResult()\n" ); } - return " $sql LIMIT " + return "$sql LIMIT " . ( (is_numeric($offset) && $offset != 0) ? "{$offset}," : "" ) . "{$limit} "; } -- 2.20.1