fancy URLs should remember page

darcs-hash:20080615035012-84dde-0450954528a270f46a4ac5d2b077af793ba8c1f3.gz
This commit is contained in:
Evan Prodromou
2008-06-14 23:50:12 -04:00
parent 16e7e96a5f
commit 83e303fe27
3 changed files with 40 additions and 13 deletions

View File

@@ -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);
}