Merge pull request #9345 from annando/issue-9344

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

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index b4ff53fdb019c18ccf4163d8370e262460f21b25..2649e9073788147ef6e7117d1982892b501fbf53 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -173,12 +173,8 @@ class JsonLD
         *
         * @return array fetched element
         */
-       public static function fetchElementArray($array, $element, $key = '@id')
+       public static function fetchElementArray($array, $element, $key = null)
        {
-               if (empty($array)) {
-                       return null;
-               }
-
                if (!isset($array[$element])) {
                        return null;
                }
@@ -191,12 +187,10 @@ class JsonLD
                $elements = [];
 
                foreach ($array[$element] as $entry) {
-                       if (!is_array($entry)) {
+                       if (!is_array($entry) || (is_null($key) && is_array($entry))) {
                                $elements[] = $entry;
-                       } elseif (isset($entry[$key])) {
+                       } elseif (!is_null($key) && isset($entry[$key])) {
                                $elements[] = $entry[$key];
-                       } elseif (!empty($entry) || !is_array($entry)) {
-                               $elements[] = $entry;
                        }
                }