friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 19:14:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

(hopefully) Fixes "Undefined index: internal-psid"

Browse source
This commit is contained in:
Michael Vogel 2020-03-28 23:11:57 +01:00
parent 3ca88f53ec
commit 1194f9a58c
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Model/Item.php
View file

@ -356,7 +356,6 @@ class Item
unset($row['internal-iid']); unset($row['internal-iid']);
unset($row['internal-psid']); unset($row['internal-psid']);
unset($row['internal-iaid']); unset($row['internal-iaid']);
unset($row['internal-icid']);
unset($row['internal-user-ignored']); unset($row['internal-user-ignored']);
unset($row['interaction']); unset($row['interaction']);
@ -680,8 +679,7 @@ class Item
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid', 'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
'network' => 'internal-network', 'icid' => 'internal-icid', 'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
if ($usermode) { if ($usermode) {
$fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored']; $fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
@ -846,15 +844,9 @@ class Item
* *
* @return string The field list * @return string The field list
*/ */
private static function constructSelectFields($fields, $selected) private static function constructSelectFields(array $fields, array $selected)
{ {
if (!empty($selected)) { $selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']);
$selected[] = 'internal-iid';
$selected[] = 'internal-psid';
$selected[] = 'internal-iaid';
$selected[] = 'internal-icid';
$selected[] = 'internal-network';
}
if (in_array('verb', $selected)) { if (in_array('verb', $selected)) {
$selected[] = 'internal-activity'; $selected[] = 'internal-activity';