Merge pull request #5722 from annando/dissolve

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

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index e62329e180a0fb1471a4edfbeea8763eb1017a15..c25eb9689805042d5eb215f72c01beb1b1d2f15c 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1050,7 +1050,7 @@ class Diaspora
                        return false;
                }
 
-               $contact = dba::selectFirst('contact', [], ['id' => $cid]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
                if (!DBA::isResult($contact)) {
                        // This here shouldn't happen at all
                        logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
@@ -1079,7 +1079,7 @@ class Diaspora
                // It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
                // It is not removed by now. Possibly the code is needed?
                //if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(Contact::PAGE_FREELOVE))) {
-               //      dba::update(
+               //      DBA::update(
                //              'contact',
                //              array('rel' => Contact::FRIEND, 'writable' => true),
                //              array('id' => $contact["id"], 'uid' => $contact["uid"])
@@ -2425,10 +2425,11 @@ class Diaspora
 
                        Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
-                       // technically they are sharing with us (Contact::SHARING),
-                       // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
-                       // we are going to change the relationship and make them a follower.
-
+                       /*
+                        * technically they are sharing with us (Contact::SHARING),
+                        * but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX
+                        * we are going to change the relationship and make them a follower.
+                        */
                        if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) {
                                $new_relation = Contact::FRIEND;
                        } elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
@@ -2755,7 +2756,7 @@ class Diaspora
         *
         * @return int The message id of the newly created item
         */
-       private static function receiveStatusMessage(array $importer, $data, $xml)
+       private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
        {
                $author = notags(unxmlify($data->author));
                $guid = notags(unxmlify($data->guid));