]> git.mxchange.org Git - friendica.git/commitdiff
Avoid warnings
authorMichael <heluecht@pirati.ca>
Wed, 26 Sep 2018 20:36:47 +0000 (20:36 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 26 Sep 2018 20:36:47 +0000 (20:36 +0000)
src/Model/APContact.php
src/Protocol/ActivityPub.php

index 22f168d8f601baecf6bf524e5e2fe973861a2bd5..c8f8998ae60ec78e67f95873e6ecf57c66767ac6 100644 (file)
@@ -105,7 +105,7 @@ class APContact extends BaseObject
 
                $apcontact = [];
                $apcontact['url'] = $data['id'];
-               $apcontact['uuid'] = defaults($data, 'uuid', null);
+               $apcontact['uuid'] = defaults($data, 'diaspora:guid', null);
                $apcontact['type'] = defaults($data, 'type', null);
                $apcontact['following'] = defaults($data, 'following', null);
                $apcontact['followers'] = defaults($data, 'followers', null);
index 539a7302b7a07d3d43c1ee29a49a796df69a5e9b..aa387d9a17ac15215519e9aa919e9d307cbbe5cd 100644 (file)
@@ -739,7 +739,7 @@ class ActivityPub
                $profile = ['network' => Protocol::ACTIVITYPUB];
                $profile['nick'] = $apcontact['nick'];
                $profile['name'] = $apcontact['name'];
-               $profile['guid'] = $apcontact['diaspora:guid'];
+               $profile['guid'] = $apcontact['uuid'];
                $profile['url'] = $apcontact['url'];
                $profile['addr'] = $apcontact['addr'];
                $profile['alias'] = $apcontact['alias'];