Merge remote-tracking branch 'upstream/develop' into logging

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

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index fa169c00468c7c3c0d55b5e3b1b365159b65f5a5..6ffe9a0a0f6b06dbede9883fe1306020bd63c5bf 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -165,7 +165,7 @@ class JsonLD
                }
                catch (Exception $e) {
                        $compacted = false;
-                       Logger::error('compacting error', ['line' => $e->getLine(), 'message' => $e->getMessage()]);
+                       Logger::notice('compacting error', ['line' => $e->getLine(), 'exception' => $e]);
                }
 
                $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
@@ -193,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]];
                }