[Pkg-nagios-changes] [pkg-icingaweb2] 03/05: Remove 10_html_purifier patch

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch test
in repository pkg-icingaweb2.

commit 71eca67115f0f00ffc49567c6e9451bb7fc48a14
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Feb 22 11:56:16 2016 +0100

    Remove 10_html_purifier patch
    
    All supported systems should have the correct "new" path.
---
 debian/patches/10_html_purifier | 26 --------------------------
 debian/patches/series           |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/10_html_purifier b/debian/patches/10_html_purifier
deleted file mode 100644
index 8e29970..0000000
--- a/debian/patches/10_html_purifier
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Allow loading of HTMLPurifier in older Debian and Ubuntu version
- (with php-htmlpurifier < 4.6)
-Author: Markus Frosch <lazyfrosch at debian.org>
-Last-Update: 2015-12-23
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: icingaweb2/modules/monitoring/application/views/helpers/PluginOutput.php
-===================================================================
---- icingaweb2.orig/modules/monitoring/application/views/helpers/PluginOutput.php	2015-12-23 11:53:41.173910143 +0100
-+++ icingaweb2/modules/monitoring/application/views/helpers/PluginOutput.php	2015-12-23 11:56:50.821703087 +0100
-@@ -92,8 +92,13 @@
-     {
-         if (self::$purifier === null) {
-             require_once 'HTMLPurifier/Bootstrap.php';
--            require_once 'HTMLPurifier.php';
--            require_once 'HTMLPurifier.autoload.php';
-+            if (include_once 'HTMLPurifier.php') {
-+                include_once 'HTMLPurifier.autoload.php';
-+            } else {
-+                // try to load the legacy location
-+                require_once 'HTMLPurifier/HTMLPurifier.php';
-+                require_once 'HTMLPurifier/HTMLPurifier.autoload.php';
-+            }
- 
-             $config = HTMLPurifier_Config::createDefault();
-             $config->set('Core.EscapeNonASCIICharacters', true);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cd204d5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-10_html_purifier

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git