Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / urlmapper.php

diff --git a/lib/urlmapper.php b/lib/urlmapper.php
index bb288f8322f7c3e71b6b8109b2e4bbe3fc621fef..bfc98ddd7970c4fbd33e8b6ab54513f67ffa5a39 100644 (file)
--- 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);