From e8439918f4857a3da050e112c9526cd758c6210e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 14 Jun 2015 15:21:50 +0200 Subject: [PATCH] Properly support FOR UPDATE + LIMIT --- wcfsetup/install/files/lib/system/database/Database.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php index bf319f9fb9..fba3294d3b 100644 --- a/wcfsetup/install/files/lib/system/database/Database.class.php +++ b/wcfsetup/install/files/lib/system/database/Database.class.php @@ -244,7 +244,7 @@ abstract class Database { */ public function handleLimitParameter($query, $limit = 0, $offset = 0) { if ($limit != 0) { - $query .= " LIMIT " . $limit . ($offset ? " OFFSET " . $offset : ''); + $query = preg_replace('~(\s+FOR\s+UPDATE\s*)?$~', " LIMIT " . $limit . ($offset ? " OFFSET " . $offset : '') . "\\0", $query, 1); } return $query; -- 2.20.1