summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-20 17:30:09 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-20 17:30:09 -0500
commit3a999af4d905d3cd23ea9163f47b6ed5c35f606c (patch)
tree747e999f45b95d2d8840f4bbdb6514473275927a /lib
parentf39dd40ffa9ae9e52fb0e83c2dfaae5f65ca5f80 (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php4
-rw-r--r--lib/util.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/router.php b/lib/router.php
index 0640a5911..85425bed2 100644
--- 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 46aa7b9df..5345a08bb 100644
--- 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')) {