MDL-58548 lib: Update htmlpurifier to the latest version.

2017-10-02 08:19:40 +08:00
parent 23ab0d7788
commit 247ff6bc2b
30 changed files with 575 additions and 115 deletions
@@ -85,11 +85,13 @@ class HTMLPurifier_URI
            $def = $config->getDefinition('URI');
            $scheme_obj = $def->getDefaultScheme($config, $context);
            if (!$scheme_obj) {
-                // something funky happened to the default scheme object
-                trigger_error(
-                    'Default scheme object "' . $def->defaultScheme . '" was not readable',
-                    E_USER_WARNING
-                );
+                if ($def->defaultScheme !== null) {
+                    // something funky happened to the default scheme object
+                    trigger_error(
+                        'Default scheme object "' . $def->defaultScheme . '" was not readable',
+                        E_USER_WARNING
+                    );
+                } // suppress error if it's null
                return false;
            }
        }