friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify the code / check number of parameters in mergeConditions

pull/9147/head
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)
{
if (count($conditions) == 1) {
return current($conditions);
}
$conditionStrings = [];
$result = [];

6
src/Model/Item.php
View File

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