Change common_local_url() to take 4 arguments

I changed common_local_url() to take an additional optional argument
-- for query parameters. Being persnickety, I made it the third of
four, and moved the last one ($fragment) down a slot. That required
changing a couple of calls.

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 18e24c0f582c1a1781dc09f058510e3c2bd32276..51c2565892976820e5fd98633b932a6da5427896 100644 (file)
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -204,7 +204,7 @@ class TwitapistatusesAction extends TwitterapiAction
         # FriendFeed's SUP protocol
         # Also added RSS and Atom feeds
 
-        $suplink = common_local_url('sup', null, $user->id);
+        $suplink = common_local_url('sup', null, null, $user->id);
         header('X-SUP-ID: '.$suplink);
 
         # XXX: since

diff --git a/actions/userrss.php b/actions/userrss.php
index 04855cccaded30a05ac67a0789647aae8b7e882f..a3e5a3aab710a05699ef64eeffb5c6084397d35a 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -46,13 +46,13 @@ class UserrssAction extends Rss10Action
     {
 
         $user = $this->user;
-        
+
         if (is_null($user)) {
             return null;
         }
-        
+
         $notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-        
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -87,10 +87,10 @@ class UserrssAction extends Rss10Action
     }
 
     # override parent to add X-SUP-ID URL
-    
+
     function initRss($limit=0)
     {
-        $url = common_local_url('sup', null, $this->user->id);
+        $url = common_local_url('sup', null, null, $this->user->id);
         header('X-SUP-ID: '.$url);
         parent::initRss($limit);
     }
@@ -100,4 +100,3 @@ class UserrssAction extends Rss10Action
         return true;
     }
 }
-

diff --git a/lib/router.php b/lib/router.php
index 0640a5911feb454dad071cb837430fcc1ba4b057..85425bed2964854d1371a05b369ffe6be29aa058 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -350,7 +350,7 @@ class Router
         return $this->m->match($path);
     }
 
-    function build($action, $args=null, $fragment=null)
+    function build($action, $args=null, $params=null, $fragment=null)
     {
         $action_arg = array('action' => $action);
 
@@ -360,6 +360,6 @@ class Router
             $args = $action_arg;
         }
 
-        return $this->m->generate($args, null, $fragment);
+        return $this->m->generate($args, $params, $fragment);
     }
 }
\ No newline at end of file

diff --git a/lib/util.php b/lib/util.php
index 46aa7b9df907b2691f0ce782376a7005da573a98..5345a08bba08346e028a55f164fcf609b416e5fd 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -705,10 +705,10 @@ function common_relative_profile($sender, $nickname, $dt=null)
     return null;
 }
 
-function common_local_url($action, $args=null, $fragment=null)
+function common_local_url($action, $args=null, $params=null, $fragment=null)
 {
     $r = Router::get();
-    $path = $r->build($action, $args, $fragment);
+    $path = $r->build($action, $args, $params, $fragment);
     if ($path) {
     }
     if (common_config('site','fancy')) {