Properly support FOR UPDATE + LIMIT

diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php
index bf319f9fb9a506898adf8d32d8aa1618bc83b59e..fba3294d3b7ed85107f22743110b78fad57c7660 100644 (file)
--- 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;