change references from subscribed to subscribers

darcs-hash:20080618171622-84dde-abe0986279b106ff651913d759828d6d945adf0f.gz

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index aca5f04fed11bf92b06f4c6c4e1121b95ce7a076..06fd3f52c43b519fb1f01fc4a3ba571890fa8426 100644 (file)
--- 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 49a44b274c819674dcc0b8ccefc623211f0413df..f339e08987a78484c6be3303c67943539be909d3 100644 (file)
--- 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 bd8e86855bb3ce4a17971f9ba965947613e357ba..090857e4abc3805be8e0516d39d253bcb8abf153 100644 (file)
--- 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&notice=$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 a0c1b5fcb0cd85f9543e29bbec5d27c1638a31d9..f34a10c5b259f3057263a7d3174509361ef20817 100644 (file)
--- 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']);