Move mod/toggle_mobile to src/Module/ToggleMobile

[friendica.git] / src / Util / JsonLD.php

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 9b0012fe381ac31ffc2e878eb4416c39c94dcaa0..69973f4febf7d95757189a7e36b8a3ffa4c04b10 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -96,9 +96,15 @@ class JsonLD
                        'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
                        'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
                        'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
-                       'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
+                       'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id'],
+                       'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id']];
 
-               // Workaround for Nextcloud Social
+               // Preparation for adding possibly missing content to the context
+               if (!empty($json['@context']) && is_string($json['@context'])) {
+                       $json['@context'] = [$json['@context']];
+               }
+
+               // Workaround for servers with missing context
                // See issue https://github.com/nextcloud/social/issues/330
                if (!empty($json['@context']) && is_array($json['@context'])) {
                        $json['@context'][] = 'https://w3id.org/security/v1';
@@ -160,7 +166,7 @@ class JsonLD
                foreach ($array[$element] as $entry) {
                        if (!is_array($entry)) {
                                $elements[] = $entry;
-                       } elseif (!empty($entry[$key])) {
+                       } elseif (isset($entry[$key])) {
                                $elements[] = $entry[$key];
                        } elseif (!empty($entry) || !is_array($entry)) {
                                $elements[] = $entry;