diff options
author | Evan Prodromou <evan@status.net> | 2010-07-28 17:51:07 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-07-28 17:51:07 -0400 |
commit | e10621a52ae25bbcde8bdf381ef4f5b9b85dc48d (patch) | |
tree | dd31af8e56e3cb63906199aff2da668e23c9ace6 /lib | |
parent | a01bc6b575861c4fc4fa00c988a7a907922187b7 (diff) | |
parent | 189d34173311828ccfe0aec5f381ad26887384ce (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
-rw-r--r-- | lib/activityutils.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/activityutils.php b/lib/activityutils.php index 401fd7fc2..dd38d4e14 100644 --- 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; } |