X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=c211ebc2a00067591703f0bbcd3955b11d29ca5d;hb=acae3df0a22e3a58cae1a64e67d1d1598463bdca;hp=b4ff53fdb019c18ccf4163d8370e262460f21b25;hpb=ca1b92bb34ef851d364f0174accbf265814fe311;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index b4ff53fdb0..c211ebc2a0 100644
--- 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, $type = null, $type_value = null)
 	{
-		if (empty($array)) {
-			return null;
-		}
-
 		if (!isset($array[$element])) {
 			return null;
 		}
@@ -191,12 +187,14 @@ class JsonLD
 		$elements = [];
 
 		foreach ($array[$element] as $entry) {
-			if (!is_array($entry)) {
-				$elements[] = $entry;
+			if (!is_array($entry) || is_null($key)) {
+				$item = $entry;
 			} elseif (isset($entry[$key])) {
-				$elements[] = $entry[$key];
-			} elseif (!empty($entry) || !is_array($entry)) {
-				$elements[] = $entry;
+				$item = $entry[$key];
+			}
+
+			if (isset($item) && (is_null($type) || is_null($type_value) || isset($item[$type]) && $item[$type] == $type_value)) {
+				$elements[] = $item;
 			}
 		}