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

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 985b3773df38a4a63e4659339a14f114e3f7af80..9815916ad19c19b0f21c501980a95640e0a9ac6b 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -581,7 +581,20 @@ function common_canonical_email($email)
     return $email;
 }
 
+<<<<<<< HEAD
 function common_purify($html, array $args=array())
+=======
+function common_to_alphanumeric($str)
+{
+    $filtered = preg_replace('/[^A-Za-z0-9]\s*/', '', $str);
+    if (strlen($filtered) < 1) {
+        throw new Exception('Filtered string was zero-length.');
+    }
+    return $filtered;
+}
+
+function common_purify($html)
+>>>>>>> upstream/master
 {
     require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';