diff options
| -rw-r--r-- | actions/finishremotesubscribe.php | 2 | ||||
| -rw-r--r-- | actions/showstream.php | 2 | ||||
| -rw-r--r-- | htaccess.sample | 2 | ||||
| -rw-r--r-- | lib/util.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php index aca5f04fe..06fd3f52c 100644 --- a/actions/finishremotesubscribe.php +++ b/actions/finishremotesubscribe.php @@ -187,7 +187,7 @@ class FinishremotesubscribeAction extends Action { # If we show subscriptions in reverse chron order, this should # show up close to the top of the page - common_redirect(common_local_url('subscribed', array('nickname' => + common_redirect(common_local_url('subscribers', array('nickname' => $user->nickname))); } diff --git a/actions/showstream.php b/actions/showstream.php index 49a44b274..f339e0898 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -289,7 +289,7 @@ class ShowstreamAction extends StreamAction { common_element_end('dt'); common_element('dd', 'subscriptions', $subs_count); common_element_start('dt', 'subscribers'); - common_element('a', array('href' => common_local_url('subscribed', + common_element('a', array('href' => common_local_url('subscribers', array('nickname' => $profile->nickname))), _t('Subscribers')); common_element_end('dt'); diff --git a/htaccess.sample b/htaccess.sample index bd8e86855..090857e4a 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -26,7 +26,7 @@ RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA] RewriteRule ^notice/(\d+)$ index.php?action=shownotice¬ice=$1 [L,QSA] RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA] -RewriteRule ^(\w+)/subscribed$ index.php?action=subscribed&nickname=$1 [L,QSA] +RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA] RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA] RewriteRule ^(\w+)/rss$ index.php?action=userrss&nickname=$1 [L,QSA] RewriteRule ^(\w+)/all$ index.php?action=all&nickname=$1 [L,QSA] diff --git a/lib/util.php b/lib/util.php index a0c1b5fcb..f34a10c5b 100644 --- a/lib/util.php +++ b/lib/util.php @@ -557,7 +557,7 @@ function common_fancy_url($action, $args=NULL) { case 'foaf': return common_path($args['nickname'].'/'.$action); case 'subscriptions': - case 'subscribed': + case 'subscribers': case 'all': if ($args && $args['page']) { return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']); |