- Revert HTTPSignature change

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

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index a0a272fdd149cbdbd3a7432ec2893ca75c6b50c6..f91d84ad5c13cd5e98a39b97db2835baa3ac176f 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -41,6 +41,21 @@ class JsonLD
         */
        public static function documentLoader($url)
        {
+               switch ($url) {
+                       case 'https://w3id.org/security/v1':
+                               $url = DI::baseUrl() . '/static/security-v1.jsonld';
+                               break;
+                       case 'https://w3id.org/identity/v1':
+                               $url = DI::baseUrl() . '/static/identity-v1.jsonld';
+                               break;
+                       case 'https://www.w3.org/ns/activitystreams':
+                               $url = DI::baseUrl() . '/static/activitystreams.jsonld';
+                               break;
+                       default:
+                               Logger::info('Got url', ['url' =>$url]);
+                               break;
+               }
+
                $recursion = 0;
 
                $x = debug_backtrace();
@@ -150,9 +165,7 @@ class JsonLD
                }
                catch (Exception $e) {
                        $compacted = false;
-                       Logger::error('compacting error');
-                       // Sooner or later we should log some details as well - but currently this leads to memory issues
-                       // Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
+                       Logger::error('compacting error', ['line' => $e->getLine(), 'message' => $e->getMessage()]);
                }
 
                $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
@@ -180,7 +193,7 @@ class JsonLD
                }
 
                // If it isn't an array yet, make it to one
-               if (!is_int(key($array[$element]))) {
+               if (!is_array($array[$element]) || !is_int(key($array[$element]))) {
                        $array[$element] = [$array[$element]];
                }