From d7d52fa52809ed6190ff790279cabb6187fbeaaa Mon Sep 17 00:00:00 2001
From: Florian Schaal <info@schaal-24.de>
Date: Tue, 20 Dec 2016 16:00:36 +0100
Subject: [PATCH] prevent duplicate LIMIT in sql-class - Fixes #4384
---
interface/lib/classes/db_mysql.inc.php | 2 +-
server/lib/classes/db_mysql.inc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 6af867edae..8c06dd71a8 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -314,7 +314,7 @@ class db extends mysqli
* @return array result row or NULL if none found
*/
public function queryOneRecord($sQuery = '') {
- if(!preg_match('/limit \d+\s*,\s*\d+$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
+ if(!preg_match('/limit \d+\s*(,\s*\d+)?$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
$aArgs = func_get_args();
$oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 64ba44ebae..ec89ba79e1 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -278,7 +278,7 @@ class db extends mysqli
* @return array result row or NULL if none found
*/
public function queryOneRecord($sQuery = '') {
- if(!preg_match('/limit \d+\s*,\s*\d+$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
+ if(!preg_match('/limit \d+\s*(,\s*\d+)?$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
$aArgs = func_get_args();
$oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
--
GitLab