From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 18 Mar 2013 20:00:13 +0000 (+0400)
Subject: Revert "add experimental HOOK_SANITIZE"
X-Git-Tag: 1.7.5~129
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=be124dc2361539455121fa29c77bf60a85014b13;p=tt-rss.git

Revert "add experimental HOOK_SANITIZE"

This reverts commit 2130fe7a18d7e1863575feda9ec39654541eee77.
---

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 79544b01..59262988 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -21,7 +21,6 @@ class PluginHost {
 	const HOOK_RENDER_ARTICLE = 10;
 	const HOOK_RENDER_ARTICLE_CDM = 11;
 	const HOOK_FEED_FETCHED = 12;
-	const HOOK_SANITIZE = 13;
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
diff --git a/include/functions.php b/include/functions.php
index ae956133..2120a96b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2597,25 +2597,12 @@
 
 		//$node = $doc->getElementsByTagName('body')->item(0);
 
+		$doc->removeChild($doc->firstChild); //remove doctype
+		$res = $doc->saveHTML();
 
-		$beforehooks = $res;
-
-		global $pluginhost;
-		if ($pluginhost) {
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_SANITIZE) as $p) {
-				$res = $p->hook_sanitize($res);
-			}
-		}
-
-		// nothing changed, use standard filters
-		if ($beforehooks == $res) {
-			$doc->removeChild($doc->firstChild); //remove doctype
-			$res = $doc->saveHTML();
-
-			$config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
-			$spec = 'img=width,height';
-			$res = htmLawed($res, $config, $spec);
-		}
+		$config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
+		$spec = 'img=width,height';
+		$res = htmLawed($res, $config, $spec);
 
 		return $res;
 	}