ParseUrl: Perform entitity decode afterwards

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index af34a0cb6f8d72dcf7c35d760d2ea1f717b8777b..d2986a362ac9cc87477095f55731aca7cd5d2124 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -466,8 +466,7 @@ class ParseUrl
                $list = $xpath->query("//script[@type='application/ld+json']");
                foreach ($list as $node) {
                        if (!empty($node->nodeValue)) {
-                               $nodevalue = html_entity_decode($node->nodeValue, ENT_COMPAT, 'UTF-8');
-                               if ($jsonld = json_decode($nodevalue, true)) {
+                               if ($jsonld = json_decode($node->nodeValue, true)) {
                                        $siteinfo = self::parseParts($siteinfo, $jsonld);
                                }
                        }
@@ -701,10 +700,16 @@ class ParseUrl
                        if ($numeric_keys) {
                                foreach ($jsonld as $part) {
                                        $siteinfo = self::parseParts($siteinfo, $part);
-                               }       
+                               }
                        }
                }
 
+               array_walk_recursive($siteinfo, function (&$element) {
+                       if (is_string($element)) {
+                               $element = html_entity_decode($element, ENT_COMPAT, 'UTF-8');
+                       }
+               });
+
                return $siteinfo;
        }