From: Michael Date: Wed, 15 Apr 2020 05:24:36 +0000 (+0000) Subject: Fix: some selected item fields hadn't been selected X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0d5d0bb65ad7c316b695cb276e58d991411bff4f;p=friendica.git Fix: some selected item fields hadn't been selected --- diff --git a/src/Model/Item.php b/src/Model/Item.php index a9a6eede23..b825170c0f 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -342,10 +342,6 @@ class Item } } - if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) { - $row['signed_text'] = $row['interaction']; - } - if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) { $row['ignored'] = $row['internal-user-ignored']; } @@ -672,7 +668,8 @@ class Item { $fields = []; - $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', + $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', + 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid', 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file', @@ -714,9 +711,7 @@ class Item 'nofinish' => 'event-nofinish','adjust' => 'event-adjust', 'ignore' => 'event-ignore', 'id' => 'event-id']; - $fields['sign'] = ['signed_text', 'signature', 'signer']; - - $fields['diaspora-interaction'] = ['interaction']; + $fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text']; return $fields; } @@ -858,10 +853,6 @@ class Item $selected[] = 'internal-user-ignored'; } - if (in_array('signed_text', $selected)) { - $selected[] = 'interaction'; - } - $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST); $selection = [];