From fe08ad66b33f63d0ca240f102703320e7fcae14d Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 14 Apr 2019 18:59:38 +0200
Subject: [PATCH] revert static getParam move

---
 src/Database/DBA.php      | 28 +++++++++++++++++++++++++---
 src/Database/Database.php | 36 ++++++------------------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index c145b456d7..23fb080904 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -106,6 +106,22 @@ class DBA
 		return Database::cleanQuery($sql);
 	}
 
+	/**
+	 * @brief Convert parameter array to an universal form
+	 * @param array $args Parameter array
+	 * @return array universalized parameter array
+	 */
+	private static function getParam($args) {
+		unset($args[0]);
+
+		// When the second function parameter is an array then use this as the parameter array
+		if ((count($args) > 0) && (is_array($args[1]))) {
+			return $args[1];
+		} else {
+			return $args;
+		}
+	}
+
 	/**
 	 * @brief Executes a prepared statement that returns data
 	 * @usage Example: $r = p("SELECT * FROM `item` WHERE `guid` = ?", $guid);
@@ -119,7 +135,9 @@ class DBA
 	 */
 	public static function p($sql)
 	{
-		return self::$dba->p($sql);
+		$params = self::getParam(func_get_args());
+
+		return self::$dba->p($sql, $params);
 	}
 
 	/**
@@ -133,7 +151,9 @@ class DBA
 	 */
 	public static function e($sql)
 	{
-		return self::$dba->e($sql);
+		$params = self::getParam(func_get_args());
+
+		return self::$dba->e($sql, $params);
 	}
 
 	/**
@@ -162,7 +182,9 @@ class DBA
 	 */
 	public static function fetchFirst($sql)
 	{
-		return self::$dba->fetchFirst($sql);
+		$params = self::getParam(func_get_args());
+
+		return self::$dba->fetchFirst($sql, $params);
 	}
 
 	/**
diff --git a/src/Database/Database.php b/src/Database/Database.php
index 4be96b5450..253c166cd0 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -400,25 +400,6 @@ class Database
 		return $sql;
 	}
 
-	/**
-	 * @brief Convert parameter array to an universal form
-	 *
-	 * @param array $args Parameter array
-	 *
-	 * @return array universalized parameter array
-	 */
-	private static function getParam($args)
-	{
-		unset($args[0]);
-
-		// When the second function parameter is an array then use this as the parameter array
-		if ((count($args) > 0) && (is_array($args[1]))) {
-			return $args[1];
-		} else {
-			return $args;
-		}
-	}
-
 	/**
 	 * @brief Executes a prepared statement that returns data
 	 * @usage Example: $r = p("SELECT * FROM `item` WHERE `guid` = ?", $guid);
@@ -427,17 +408,15 @@ class Database
 	 * For all regular queries please use DBA::select or DBA::exists
 	 *
 	 * @param string $sql SQL statement
+	 * @param array $params SQL parameters
 	 *
 	 * @return bool|object statement object or result object
 	 * @throws \Exception
 	 */
-	public function p($sql)
+	public function p($sql, array $params = [])
 	{
-
 		$stamp1 = microtime(true);
 
-		$params = self::getParam(func_get_args());
-
 		// Renumber the array keys to be sure that they fit
 		$i = 0;
 		$args = [];
@@ -660,17 +639,15 @@ class Database
 	 * Please use DBA::delete, DBA::insert, DBA::update, ... instead
 	 *
 	 * @param string $sql SQL statement
+	 * @param array  $params SQL parameters
 	 *
 	 * @return boolean Was the query successfull? False is returned only if an error occurred
 	 * @throws \Exception
 	 */
-	public function e($sql)
+	public function e($sql, array $params = [])
 	{
-
 		$stamp = microtime(true);
 
-		$params = self::getParam(func_get_args());
-
 		// In a case of a deadlock we are repeating the query 20 times
 		$timeout = 20;
 
@@ -768,14 +745,13 @@ class Database
 	 * @brief Fetches the first row
 	 *
 	 * @param string $sql SQL statement
+	 * @param array  $params SQL parameters
 	 *
 	 * @return array first row of query
 	 * @throws \Exception
 	 */
-	public function fetchFirst($sql)
+	public function fetchFirst($sql, array $params = [])
 	{
-		$params = self::getParam(func_get_args());
-
 		$stmt = $this->p($sql, $params);
 
 		if (is_bool($stmt)) {