Fixing a bug, adding some logging

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 2b5a5c4e7b15015636170933b764d82e31071b75..71f3cfae47bac438192582cc77ef8605d84c35b7 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -137,7 +137,7 @@ class APContact extends BaseObject
                $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
 
                $apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
-               if (is_array($apcontact['photo'])) {
+               if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
                        $apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
                }
 
@@ -157,7 +157,7 @@ class APContact extends BaseObject
 
                $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
 
-               $manually_approve = JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
+               $apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
 
                // To-Do
 
@@ -204,8 +204,8 @@ class APContact extends BaseObject
                                        $contact_fields['prv'] = false;
                                } else {
                                        // Otherwise set the corresponding forum type
-                                       $contact_fields['forum'] = !$manually_approve;
-                                       $contact_fields['prv'] = $manually_approve;
+                                       $contact_fields['forum'] = !$apcontact['manually-approve'];
+                                       $contact_fields['prv'] = $apcontact['manually-approve'];
                                }
                        }
                }