diff options
| author | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
| commit | 9f0715a9935966f3ec483bccc476d5baf3324b3c (patch) | |
| tree | 9874247927e5e24044c75a48a9c04e427b0ba477 /lib/activityutils.php | |
| parent | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff) | |
| parent | b17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/activityutils.php')
| -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; } |