Merge branch 'master' of gitorious.org:statusnet/mainline

diff --git a/lib/activityutils.php b/lib/activityutils.php
index 401fd7fc283ff92b9b5d5a021ecbd6e74780fa74..dd38d4e14222b8da15030918d8d2ef187d5bdb8d 100644 (file)
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -257,6 +257,12 @@ class ActivityUtils
      */
     static function validateUri($uri)
     {
+        // Check mailto: URIs first
+
+        if (preg_match('/^mailto:(.*)$/', $uri, $match)) {
+            return Validate::email($match[1], common_config('email', 'check_domain'));
+        }
+
         if (Validate::uri($uri)) {
             return true;
         }