Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / extlib / HTMLPurifier / HTMLPurifier.func.php

diff --git a/extlib/HTMLPurifier/HTMLPurifier.func.php b/extlib/HTMLPurifier/HTMLPurifier.func.php
index 56a55b2fedac9c4c035ae476ece07e56cdb14252..64b140bec2199f30edb2e1370063650e66bf5bd6 100644 (file)
--- a/extlib/HTMLPurifier/HTMLPurifier.func.php
+++ b/extlib/HTMLPurifier/HTMLPurifier.func.php
@@ -8,11 +8,13 @@
 
 /**
  * Purify HTML.
- * @param $html String HTML to purify
- * @param $config Configuration to use, can be any value accepted by
+ * @param string $html String HTML to purify
+ * @param mixed $config Configuration to use, can be any value accepted by
  *        HTMLPurifier_Config::create()
+ * @return string
  */
-function HTMLPurifier($html, $config = null) {
+function HTMLPurifier($html, $config = null)
+{
     static $purifier = false;
     if (!$purifier) {
         $purifier = new HTMLPurifier();