bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify the code / check number of parameters in mergeConditions

Browse source
This commit is contained in:
Michael 2020-09-06 20:28:08 +00:00
parent 8d0d6bcd0c
commit 4852458645
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Database/DBA.php
View file

@ -669,6 +669,10 @@ class DBA
*/ */
public static function mergeConditions(array ...$conditions) public static function mergeConditions(array ...$conditions)
{ {
if (count($conditions) == 1) {
return current($conditions);
}
$conditionStrings = []; $conditionStrings = [];
$result = []; $result = [];

6
src/Model/Item.php
View file

@ -201,11 +201,7 @@ class Item
return []; return [];
} }
if (!empty($condition)) { $condition = DBA::mergeConditions(['iid' => $pinned], $condition);
$condition = DBA::mergeConditions(['iid' => $pinned], $condition);
} else {
$condition = ['iid' => $pinned];
}
return self::selectThreadForUser($uid, $selected, $condition, $params); return self::selectThreadForUser($uid, $selected, $condition, $params);
} }