From bb7ad665265a29303ec59918f0c1832528bdc509 Mon Sep 17 00:00:00 2001
From: John Flatness <john@zerocrates.org>
Date: Thu, 28 Dec 2017 01:55:16 -0500
Subject: [PATCH] Quarantine __autoload defs for PHP 7.2 compat

---
 extras/HTMLPurifierExtras.autoload-legacy.php | 15 +++++++++++++++
 extras/HTMLPurifierExtras.autoload.php        |  5 +----
 library/HTMLPurifier.autoload-legacy.php      | 15 +++++++++++++++
 library/HTMLPurifier.autoload.php             |  5 +----
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 extras/HTMLPurifierExtras.autoload-legacy.php
 create mode 100644 library/HTMLPurifier.autoload-legacy.php

diff --git a/extras/HTMLPurifierExtras.autoload-legacy.php b/extras/HTMLPurifierExtras.autoload-legacy.php
new file mode 100644
index 00000000..d1485bf2
--- /dev/null
+++ b/extras/HTMLPurifierExtras.autoload-legacy.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Legacy autoloader for systems lacking spl_autoload_register
+ *
+ * Must be separate to prevent deprecation warning on PHP 7.2
+ */
+
+function __autoload($class)
+{
+    return HTMLPurifierExtras::autoload($class);
+}
+
+// vim: et sw=4 sts=4
diff --git a/extras/HTMLPurifierExtras.autoload.php b/extras/HTMLPurifierExtras.autoload.php
index de4a8aaa..69c90953 100644
--- a/extras/HTMLPurifierExtras.autoload.php
+++ b/extras/HTMLPurifierExtras.autoload.php
@@ -17,10 +17,7 @@ if (function_exists('spl_autoload_register')) {
         spl_autoload_register('__autoload');
     }
 } elseif (!function_exists('__autoload')) {
-    function __autoload($class)
-    {
-        return HTMLPurifierExtras::autoload($class);
-    }
+    require dirname(__FILE__) . '/HTMLPurifierExtras.autoload-legacy.php';
 }
 
 // vim: et sw=4 sts=4
diff --git a/library/HTMLPurifier.autoload-legacy.php b/library/HTMLPurifier.autoload-legacy.php
new file mode 100644
index 00000000..c271cd15
--- /dev/null
+++ b/library/HTMLPurifier.autoload-legacy.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Legacy autoloader for systems lacking spl_autoload_register
+ *
+ * Must be separate to prevent deprecation warning on PHP 7.2
+ */
+
+function __autoload($class)
+{
+    return HTMLPurifier_Bootstrap::autoload($class);
+}
+
+// vim: et sw=4 sts=4
diff --git a/library/HTMLPurifier.autoload.php b/library/HTMLPurifier.autoload.php
index c3ea67e8..9d8d2992 100644
--- a/library/HTMLPurifier.autoload.php
+++ b/library/HTMLPurifier.autoload.php
@@ -14,10 +14,7 @@ if (function_exists('spl_autoload_register') && function_exists('spl_autoload_un
         spl_autoload_register('__autoload');
     }
 } elseif (!function_exists('__autoload')) {
-    function __autoload($class)
-    {
-        return HTMLPurifier_Bootstrap::autoload($class);
-    }
+    require dirname(__FILE__) . '/HTMLPurifier.autoload-legacy.php';
 }
 
 if (ini_get('zend.ze1_compatibility_mode')) {
-- 
2.11.4.GIT