Merge branch 'testing' into 0.9.x

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

diff --git a/actions/subscribers.php b/actions/subscribers.php
index df9ec996159abf64dfb4c04b26bdfb9b7c13e359..4bced62840dcda4f3f8a28d591583b901729ccc1 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 '.
@@ -143,9 +143,12 @@ class SubscribersListItem extends SubscriptionListItem
     function showActions()
     {
         $this->startActions();
-        $this->showSubscribeButton();
-        // Relevant code!
-        $this->showBlockForm();
+        if (Event::handle('StartProfileListItemActionElements', array($this))) {
+            $this->showSubscribeButton();
+            // Relevant code!
+            $this->showBlockForm();
+            Event::handle('EndProfileListItemActionElements', array($this));
+        }
         $this->endActions();
     }