summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-04 05:29:21 -0800
committerEvan Prodromou <evan@controlyourself.ca>2009-03-04 05:29:21 -0800
commitc0115bf3bc8957fd2db2dd135ad885ed1b8d6158 (patch)
treeccf5d9cf5a4e9ac4b893d9c163fb25c46070f271
parent458c03786735bd3e3b6619b2d20538bd55acd0c6 (diff)
fix pagination links with new URL mapper
-rw-r--r--lib/action.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/action.php b/lib/action.php
index 9c71a153d..812df635e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -976,17 +976,17 @@ class Action extends HTMLOutputter // lawsuit
}
if ($have_before) {
$pargs = array('page' => $page-1);
- $newargs = $args ? array_merge($args, $pargs) : $pargs;
$this->elementStart('li', array('class' => 'nav_prev'));
- $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
+ $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+ 'rel' => 'prev'),
_('After'));
$this->elementEnd('li');
}
if ($have_after) {
$pargs = array('page' => $page+1);
- $newargs = $args ? array_merge($args, $pargs) : $pargs;
$this->elementStart('li', array('class' => 'nav_next'));
- $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
+ $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+ 'rel' => 'next'),
_('Before'));
$this->elementEnd('li');
}