Merge branch 'master' of git@github.com:/gallery/gallery3

Conflicts:
	modules/server_add/controllers/admin_server_add.php

1 files changed, 21 insertions, 0 deletions

diff --git a/modules/gallery/lib/HTMLPurifier/HTMLPurifier.autoload.php b/modules/gallery/lib/HTMLPurifier/HTMLPurifier.autoload.php
new file mode 100644
index 00000000..a9f1cc31
--- /dev/null
+++ b/modules/gallery/lib/HTMLPurifier/HTMLPurifier.autoload.php
@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * @file
+ * Convenience file that registers autoload handler for HTML Purifier.
+ */
+
+if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
+    // We need unregister for our pre-registering functionality
+    HTMLPurifier_Bootstrap::registerAutoload();
+    if (function_exists('__autoload')) {
+        // Be polite and ensure that userland autoload gets retained
+        spl_autoload_register('__autoload');
+    }
+} elseif (!function_exists('__autoload')) {
+    function __autoload($class) {
+        return HTMLPurifier_Bootstrap::autoload($class);
+    }
+}
+
+// vim: et sw=4 sts=4