Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

This commit is contained in:
abjectio 2015-06-13 11:10:10 +02:00
commit fca53a56b4

View File

@ -92,7 +92,7 @@ class URLMapper
}
}
$regex = $this->makeRegex($path, $paramPatterns);
$regex = self::makeRegex($path, $paramPatterns);
$this->variables[] = array($args, $regex, $paramNames);
@ -207,7 +207,7 @@ class URLMapper
return $match['name'];
}
protected function makeRegex($path, $paramPatterns)
static function makeRegex($path, $paramPatterns)
{
$pr = new PatternReplacer($paramPatterns);