Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/urlmapper.php b/lib/urlmapper.php
index d17493e21d5a8cfd645cecbf57da84eea3304b94..bfc98ddd7970c4fbd33e8b6ab54513f67ffa5a39 100644 (file)
--- a/lib/urlmapper.php
+++ b/lib/urlmapper.php
@@ -39,7 +39,7 @@ if (!defined('STATUSNET')) {
  *
  * Converts a path into a set of parameters, and vice versa
  *
- * We used to use Net_URL_Mapper, so there's a wrapper class at Router, q.v.
+ * We used to use URLMapper, so there's a wrapper class at Router, q.v.
  *
  * NUM's vagaries are the main reason we have weirdnesses here.
  *
@@ -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);