diff options
author | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
---|---|---|
committer | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
commit | 3c53e821cc545d14807c9197d07e8686028a846d (patch) | |
tree | e51f35dc8783ea2ba3c9443d28a55a707330909a /lib/action.php | |
parent | e5345d8d7a5b519cfb24c9e2a971b485b3c1c872 (diff) | |
parent | ea0c5f565c9ca4b34c1071a51333f0f842a954b9 (diff) |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/action.php')
-rw-r--r-- | lib/action.php | 8 |
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'); } |