diff --git a/library/HTMLPurifier.autoload-legacy.php b/library/HTMLPurifier.autoload-legacy.php
index c271cd15..7766b203 100644
--- a/library/HTMLPurifier.autoload-legacy.php
+++ b/library/HTMLPurifier.autoload-legacy.php
@@ -7,9 +7,10 @@
* Must be separate to prevent deprecation warning on PHP 7.2
*/
-function __autoload($class)
+spl_autoload_register(function($class)
{
- return HTMLPurifier_Bootstrap::autoload($class);
+ return HTMLPurifier_Bootstrap::autoload($class);
}
+});
// vim: et sw=4 sts=4
diff --git a/library/HTMLPurifier/HTMLModule.php b/library/HTMLPurifier/HTMLModule.php
index 6d898f80..9dbb9872 100644
--- a/library/HTMLPurifier/HTMLModule.php
+++ b/library/HTMLPurifier/HTMLModule.php
@@ -257,8 +257,9 @@ class HTMLPurifier_HTMLModule
*/
public function makeLookup($list)
{
+ $args = func_get_args();
if (is_string($list)) {
- $list = func_get_args();
+ $list = $args;
}
$ret = array();
foreach ($list as $value) {