forked from GNUsocial/gnu-social
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
This commit is contained in:
commit
fca53a56b4
@ -92,7 +92,7 @@ class URLMapper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$regex = $this->makeRegex($path, $paramPatterns);
|
$regex = self::makeRegex($path, $paramPatterns);
|
||||||
|
|
||||||
$this->variables[] = array($args, $regex, $paramNames);
|
$this->variables[] = array($args, $regex, $paramNames);
|
||||||
|
|
||||||
@ -207,7 +207,7 @@ class URLMapper
|
|||||||
return $match['name'];
|
return $match['name'];
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function makeRegex($path, $paramPatterns)
|
static function makeRegex($path, $paramPatterns)
|
||||||
{
|
{
|
||||||
$pr = new PatternReplacer($paramPatterns);
|
$pr = new PatternReplacer($paramPatterns);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user