Merge branch 'openid-plugin' into 'nightly'

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

diff --git a/lib/urlmapper.php b/lib/urlmapper.php
index d17493e21d5a8cfd645cecbf57da84eea3304b94..3a6f70fcdaee525cd5bf9c8b6326ee9bdfe82f74 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);