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

Conflicts:
	modules/server_add/controllers/admin_server_add.php

1 files changed, 23 insertions, 0 deletions

diff --git a/modules/gallery/lib/HTMLPurifier/HTMLPurifier.func.php b/modules/gallery/lib/HTMLPurifier/HTMLPurifier.func.php
new file mode 100644
index 00000000..141d7f5f
--- /dev/null
+++ b/modules/gallery/lib/HTMLPurifier/HTMLPurifier.func.php
@@ -0,0 +1,23 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * @file
+ * Defines a function wrapper for HTML Purifier for quick use.
+ * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
+ */
+
+/**
+ * Purify HTML.
+ * @param $html String HTML to purify
+ * @param $config Configuration to use, can be any value accepted by
+ *        HTMLPurifier_Config::create()
+ */
+function HTMLPurifier($html, $config = null) {
+    static $purifier = false;
+    if (!$purifier) {
+        $purifier = new HTMLPurifier();
+    }
+    return $purifier->purify($html, $config);
+}
+
+// vim: et sw=4 sts=4