Issue 8735: Ensure the correct data type for "hide"

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0fab3ba07fb545d3494cb5cd50fc4e0fbd06aff9..7a965f80b5f41649856f47abf2d0866afbf046e5 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -72,14 +72,14 @@ class Item
                'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
                'event-summary', 'event-desc', 'event-location', 'event-type',
                'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
-               'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed', 'activity'
+               'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed'
        ];
 
        // Field list that is used to deliver items via the protocols
        const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
                        'parent-guid', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
                        'private', 'title', 'body', 'location', 'coord', 'app',
-                       'attach', 'deleted', 'extid', 'post-type',
+                       'attach', 'deleted', 'extid', 'post-type', 'gravity',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                        'author-id', 'author-link', 'owner-link', 'contact-uid',
                        'signed_text', 'signature', 'signer', 'network'];
@@ -285,6 +285,10 @@ class Item
                        }
                }
 
+               if (array_key_exists('vid', $row) && is_null($row['vid']) && !empty($row['verb'])) {
+                       $row['vid'] = Verb::getID($row['verb']);
+               }
+                       
                if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', Activity::POST, Activity::SHARE])) {
                        // Build the file string out of the term entries
                        if (array_key_exists('file', $row) && empty($row['file'])) {
@@ -1066,7 +1070,7 @@ class Item
 
                // clean up categories and tags so they don't end up as orphans
 
-               $matches = false;
+               $matches = [];
                $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
 
                if ($cnt) {
@@ -1075,7 +1079,7 @@ class Item
                        }
                }
 
-               $matches = false;
+               $matches = [];
 
                $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
 
@@ -1777,7 +1781,7 @@ class Item
 
                // Check for hashtags in the body and repair or add hashtag links
                self::setHashtags($item);
-               
+
                // Fill the cache field
                self::putInCache($item);
 
@@ -1796,12 +1800,14 @@ class Item
                }
 
                $body = $item['body'];
-               
+
                // We just remove everything that is content
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
                        unset($item[$field]);
                }
 
+               unset($item['activity']);
+
                // Filling item related side tables
 
                // Diaspora signature