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

2015-06-13 11:10:10 +02:00
parent 437dc3d713 a03249dd99
commit fca53a56b4
1 changed files with 2 additions and 2 deletions
--- a/lib/urlmapper.php
+++ b/lib/urlmapper.php
@@ -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);