Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

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

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 1c44947f58052823a0a28598341f2a1fa76b977a..280dbe72c2a2afe151b5c5d47dd8e11a561fc182 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -333,7 +333,7 @@ class PortableContact
                        $server_url = normalise_link(self::detectServer($profile));
                }
 
-               if (!in_array($gcontacts[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
+               if (!in_array($gcontacts[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
                        logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
                        return false;
                }
@@ -1157,9 +1157,9 @@ class PortableContact
 
                                if (isset($data['version'])) {
                                        $platform = "Mastodon";
-                                       $version = $data['version'];
-                                       $site_name = $data['title'];
-                                       $info = $data['description'];
+                                       $version = defaults($data, 'version', '');
+                                       $site_name = defaults($data, 'title', '');
+                                       $info = defaults($data, 'description', '');
                                        $network = Protocol::OSTATUS;
                                }
 
@@ -1472,7 +1472,7 @@ class PortableContact
                        $tags = [];
                        foreach ($data['tags'] as $tag) {
                                $tag = mb_strtolower($tag);
-                               if (count($tag) < 100) {
+                               if (strlen($tag) < 100) {
                                        $tags[$tag] = $tag;
                                }
                        }