Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / actions / subscribers.php

diff --git a/actions/subscribers.php b/actions/subscribers.php
index df9ec996159abf64dfb4c04b26bdfb9b7c13e359..cd3e2ee5bedd136190ddea88971c526345c98b73 100644 (file)
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction
         if ($this->page == 1) {
             return sprintf(_('%s subscribers'), $this->user->nickname);
         } else {
-            return sprintf(_('%s subscribers, page %d'),
+            return sprintf(_('%1$s subscribers, page %2$d'),
                            $this->user->nickname,
                            $this->page);
         }
@@ -57,7 +57,7 @@ class SubscribersAction extends GalleryAction
 
     function showPageNotice()
     {
-        $user =& common_current_user();
+        $user = common_current_user();
         if ($user && ($user->id == $this->profile->id)) {
             $this->element('p', null,
                            _('These are the people who listen to '.