From 6a62b87e4d42903833dfd82ea5f317f95a07bcd1 Mon Sep 17 00:00:00 2001
From: stevleibelt <stev_leibelt@freiberg.de>
Date: Tue, 9 Feb 2021 08:57:56 +0100
Subject: [PATCH] [ZBX-18984]: fixed

---
 ui/include/classes/db/DB.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/include/classes/db/DB.php b/ui/include/classes/db/DB.php
index 4bb3a50050..1b69fb3964 100644
--- a/ui/include/classes/db/DB.php
+++ b/ui/include/classes/db/DB.php
@@ -990,13 +990,13 @@ class DB {
 		];
 
 		// add output options
-		$sql_parts = self::applyQueryOutputOptions($table_name, $options, $table_alias, $sql_parts);
+		$sql_parts = self::applyQueryOutputOptions($table_name, $options, $sql_parts, $table_alias);
 
 		// add filter options
-		$sql_parts = self::applyQueryFilterOptions($table_name, $options, $table_alias, $sql_parts);
+		$sql_parts = self::applyQueryFilterOptions($table_name, $options, $sql_parts, $table_alias);
 
 		// add sort options
-		$sql_parts = self::applyQuerySortOptions($table_name, $options, $table_alias, $sql_parts);
+		$sql_parts = self::applyQuerySortOptions($table_name, $options, $sql_parts, $table_alias);
 
 		return $sql_parts;
 	}
@@ -1006,13 +1006,13 @@ class DB {
 	 *
 	 * @param string $table_name
 	 * @param array  $options
-	 * @param string $table_alias
 	 * @param array  $sql_parts
+     * @param string $table_alias
 	 *
 	 * @return array
 	 */
-	private static function applyQueryOutputOptions($table_name, array $options, $table_alias = null,
-			array $sql_parts) {
+	private static function applyQueryOutputOptions($table_name, array $options, array $sql_parts,
+            $table_alias = null) {
 		if ($options['countOutput']) {
 			$sql_parts['select'][] = 'COUNT('.self::fieldId('*', $table_alias).') AS rowscount';
 		}
@@ -1042,13 +1042,13 @@ class DB {
 	 *
 	 * @param string $table_name
 	 * @param array  $options
-	 * @param string $table_alias
 	 * @param array  $sql_parts
+     * @param string $table_alias
 	 *
 	 * @return array
 	 */
-	private static function applyQueryFilterOptions($table_name, array $options, $table_alias = null,
-			array $sql_parts) {
+	private static function applyQueryFilterOptions($table_name, array $options, array $sql_parts,
+            $table_alias = null) {
 		$table_schema = self::getSchema($table_name);
 		$pk = self::getPk($table_name);
 		$pk_option = $pk.'s';
@@ -1079,7 +1079,7 @@ class DB {
 
 		// filters
 		if (is_array($options['filter'])) {
-			$sql_parts = self::dbFilter($table_name, $options, $table_alias, $sql_parts);
+			$sql_parts = self::dbFilter($table_name, $options, $sql_parts, $table_alias);
 		}
 
 		return $sql_parts;
@@ -1095,7 +1095,7 @@ class DB {
 	 *
 	 * @return bool
 	 */
-	private static function dbFilter($table_name, $options, $table_alias = null, $sql_parts) {
+	private static function dbFilter($table_name, array $options, array $sql_parts, $table_alias = null) {
 		$table_schema = self::getSchema($table_name);
 		$filter = [];
 
@@ -1149,12 +1149,12 @@ class DB {
 	 *
 	 * @param string $table_name
 	 * @param array  $options
-	 * @param string $table_alias
 	 * @param array  $sql_parts
+     * @param string $table_alias
 	 *
 	 * @return array
 	 */
-	private static function applyQuerySortOptions($table_name, array $options, $table_alias = null, array $sql_parts) {
+	private static function applyQuerySortOptions($table_name, array $options, array $sql_parts, $table_alias = null) {
 		$table_schema = self::getSchema($table_name);
 
 		foreach ($options['sortfield'] as $index => $field_name) {
-- 
2.29.1.windows.1