diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-06-14 23:50:12 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-06-14 23:50:12 -0400 |
| commit | 83e303fe270fa86fc0a289cf141a103f5bfd3787 (patch) | |
| tree | 7cbb059135b2b397c8a7574505d0b61c5b6c0788 /lib/util.php | |
| parent | 16e7e96a5ff6419869a5def21e10bb11130e626d (diff) | |
fancy URLs should remember page
darcs-hash:20080615035012-84dde-0450954528a270f46a4ac5d2b077af793ba8c1f3.gz
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/util.php b/lib/util.php index ff992141e..1c6bbaf16 100644 --- a/lib/util.php +++ b/lib/util.php @@ -509,7 +509,11 @@ function common_local_url($action, $args=NULL) { function common_fancy_url($action, $args=NULL) { switch (strtolower($action)) { case 'public': - return common_path(''); + if ($args && $args['page']) { + return common_path('?page=' . $args['page']); + } else { + return common_path(''); + } case 'publicrss': return common_path('rss'); case 'doc': @@ -529,18 +533,27 @@ function common_fancy_url($action, $args=NULL) { return common_path('notice/new'); case 'shownotice': return common_path('notice/'.$args['notice']); - case 'subscriptions': - case 'subscribed': case 'xrds': - case 'all': case 'foaf': return common_path($args['nickname'].'/'.$action); + case 'subscriptions': + case 'subscribed': + case 'all': + if ($args && $args['page']) { + return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']); + } else { + return common_path($args['nickname'].'/'.$action); + } case 'allrss': return common_path($args['nickname'].'/all/rss'); case 'userrss': return common_path($args['nickname'].'/rss'); case 'showstream': - return common_path($args['nickname']); + if ($args && $args['page']) { + return common_path($args['nickname'].'?page=' . $args['page']); + } else { + return common_path($args['nickname']); + } default: return common_simple_url($action, $args); } |