update zendxml

2 files changed, 13 insertions, 14 deletions

diff --git a/articleenhancer/globalarticleenhancer.php b/articleenhancer/globalarticleenhancer.php
index 4c01a238c..1939ca41c 100644
--- a/articleenhancer/globalarticleenhancer.php
+++ b/articleenhancer/globalarticleenhancer.php
@@ -32,10 +32,9 @@ class GlobalArticleEnhancer implements ArticleEnhancer {
         // inside <p> tags
         $body = '<div>' . $item->getBody() . '</div>';
 
-        Security::scan($body, $dom, function ($xml, $dom) {
-            return @$dom->loadHTML($xml, LIBXML_HTML_NOIMPLIED
-                | LIBXML_HTML_NODEFDTD | LIBXML_NONET);
-        });
+        $isOk = Security::scanHtml(
+            $body, $dom, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD
+        );
 
         $xpath = new \DOMXpath($dom);
 
diff --git a/articleenhancer/xpatharticleenhancer.php b/articleenhancer/xpatharticleenhancer.php
index 871752856..aa94eec54 100644
--- a/articleenhancer/xpatharticleenhancer.php
+++ b/articleenhancer/xpatharticleenhancer.php
@@ -70,9 +70,7 @@ class XPathArticleEnhancer implements ArticleEnhancer {
 
                 $dom = new DOMDocument();
 
-                Security::scan($body, $dom, function ($xml, $dom) {
-                    return @$dom->loadHTML($xml, LIBXML_NONET);
-                });
+                $isOk = Security::scanHtml($body, $dom);
 
                 $xpath = new DOMXpath($dom);
                 $xpathResult = $xpath->evaluate($search);
@@ -121,14 +119,16 @@ class XPathArticleEnhancer implements ArticleEnhancer {
         $dom = new DOMDocument();
         $dom->preserveWhiteSpace = false;
 
-        $isOk = Security::scan($xmlString, $dom, function ($xml, $dom) {
-            // wrap in div to prevent loadHTML from inserting weird elements
-            $xml = '<div>' . $xml . '</div>';
-            return @$dom->loadHTML($xml, LIBXML_NONET | LIBXML_HTML_NODEFDTD
-                | LIBXML_HTML_NOIMPLIED);
-        });
+        if($xmlString === '') {
+            return false;
+        }
+
+        $xmlString = '<div>' . $xmlString . '</div>';
+        $isOk = Security::scanHtml(
+            $xmlString, $dom, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD
+        );
 
-        if($xmlString === '' || !$isOk) {
+        if(!$isOk) {
             return false;
         }