GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't statically call Validate functions

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-07-07 19:30:14 +02:00
parent 62c6ed58ba
commit edef6f929a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/activityutils.php
View File

@ -281,19 +281,20 @@ class ActivityUtils
static function validateUri($uri)
{
// Check mailto: URIs first
$validate = new Validate();
if (preg_match('/^mailto:(.*)$/', $uri, $match)) {
return Validate::email($match[1], common_config('email', 'check_domain'));
return $validate->email($match[1], common_config('email', 'check_domain'));
}
if (Validate::uri($uri)) {
if ($validate->uri($uri)) {
return true;
}
// Possibly an upstream bug; tag: URIs aren't validated properly
// unless you explicitly ask for them. All other schemes are accepted
// for basic URI validation without asking.
if (Validate::uri($uri, array('allowed_scheme' => array('tag')))) {
if ($validate->uri($uri, array('allowed_scheme' => array('tag')))) {
return true;
}