Merge branch 'master' into develop

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index e91d81f58e212d7453ae9160dc80410a355e8db1..ce9e6642edec4edab337907fdc57bbbbd3bcda6c 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1947,7 +1947,7 @@ class OStatus
         * @param bool   $complete default true
         * @return void
         */
-       private static function entryFooter($doc, $entry, $item, $owner, $complete = true)
+       private static function entryFooter($doc, $entry, array $item, array $owner, $complete = true)
        {
                $mentioned = [];
 
@@ -1987,6 +1987,7 @@ class OStatus
 
                        if (isset($parent_item)) {
                                $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item);
+
                                if (DBM::is_result($r)) {
                                        if ($r['conversation-uri'] != '') {
                                                $conversation_uri = $r['conversation-uri'];
@@ -2047,9 +2048,11 @@ class OStatus
                }
 
                if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
-                       XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
-                                                                       "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
-                                                                       "href" => $owner['url']]);
+                       XML::addElement($doc, $entry, "link", "", [
+                               "rel" => "mentioned",
+                               "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
+                               "href" => $owner['url']
+                       ]);
                }
 
                if (!$item["private"]) {