tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8466 from annando/internal-psid

Browse source 
Should fix the unknown "internal-psid" field
This commit is contained in:
Michael Vogel 2020-03-29 14:31:44 +02:00 committed by GitHub
commit 11f38ee303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Item.php
View file

@ -177,7 +177,7 @@ class Item
} }
$pinned = []; $pinned = [];
while ($useritem = self::fetch($useritems)) { while ($useritem = DBA::fetch($useritems)) {
$pinned[] = $useritem['iid']; $pinned[] = $useritem['iid'];
} }
DBA::close($useritems); DBA::close($useritems);
@ -846,7 +846,9 @@ class Item
*/ */
private static function constructSelectFields(array $fields, array $selected) private static function constructSelectFields(array $fields, array $selected)
{ {
$selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']); if (!empty($selected)) {
$selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']);
}
if (in_array('verb', $selected)) { if (in_array('verb', $selected)) {
$selected[] = 'internal-activity'; $selected[] = 'internal-activity';