MDL-25826 import HTMLPurifier 4.3.0

2011-04-09 11:51:35 +02:00
parent eb9d692f8b
commit 8adf19eda8
42 changed files with 852 additions and 211 deletions
@@ -60,7 +60,13 @@ class HTMLPurifier_ConfigSchema {
     * Unserializes the default ConfigSchema.
     */
    public static function makeFromSerial() {
-        return unserialize(file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser'));
+        $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
+        $r = unserialize($contents);
+        if (!$r) {
+            $hash = sha1($contents);
+            trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
+        }
+        return $r;
    }

    /**