Merge pull request #8581 from annando/perfect-scrollbar

Integrate perfect-scrollbar to make tests happy

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 8ab14c0..cff50f0 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -2081,11 +2081,9 @@ class OStatus
                        XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
                }
 
-               $tags = Tag::getByURIId($item['uri-id']);
-               if (count($tags)) {
-                       foreach ($tags as $tag) {
-                               $mentioned[$tag['url']] = $tag['url'];
-                       }
+               // uri-id isn't present for follow entry pseudo-items
+               foreach (Tag::getByURIId($item['uri-id'] ?? 0) as $tag) {
+                       $mentioned[$tag['url']] = $tag['url'];
                }
 
                // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)