Merge "libxml_disable_entity_loader() just in case..."

diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index eb3e941..248a76f 100644 (file)
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -73,9 +73,11 @@ class HtmlFormatter {
                        $html = str_replace( ' <', '&#32;<', $html );
 
                        libxml_use_internal_errors( true );
+                       $loader = libxml_disable_entity_loader();
                        $this->doc = new DOMDocument();
                        $this->doc->strictErrorChecking = false;
                        $this->doc->loadHTML( $html );
+                       libxml_disable_entity_loader( $loader );
                        libxml_use_internal_errors( false );
                        $this->doc->encoding = 'UTF-8';
                }