Merge pull request #7248 from nupplaphil/bugs/6916-fatal-network

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

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index bf4ecbe3e238a428a5275eca2c267bec23e87b21..926fa1437d46aa1cb4efac0c8d79fbdaf1527d2d 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -68,9 +68,16 @@ class JsonLD
                }
                catch (Exception $e) {
                        $normalized = false;
-                       Logger::error('normalise error');
-                       // Sooner or later we should log some details as well - but currently this leads to memory issues
-                       // Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
+                       $messages = [];
+                       $currentException = $e;
+                       do {
+                               $messages[] = $currentException->getMessage();
+                       } while($currentException = $currentException->getPrevious());
+
+                       Logger::warning('JsonLD normalize error');
+                       Logger::notice('JsonLD normalize error', ['messages' => $messages]);
+                       Logger::info('JsonLD normalize error', ['trace' => $e->getTraceAsString()]);
+                       Logger::debug('JsonLD normalize error', ['jsonobj' => $jsonobj]);
                }
 
                return $normalized;
@@ -96,7 +103,8 @@ 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']];
 
                // Preparation for adding possibly missing content to the context
                if (!empty($json['@context']) && is_string($json['@context'])) {
@@ -165,7 +173,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;