move block form

2 files changed, 8 insertions, 1 deletions

diff --git a/actions/subscribers.php b/actions/subscribers.php
index fb8733c77..e88cbf693 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -96,7 +96,7 @@ class SubscribersAction extends GalleryAction
 
 class SubscribersList extends ProfileList
 {
-    function showOwnerControls($profile)
+    function showBlockForm()
     {
         $bf = new BlockForm($this->out, $profile,
                             array('action' => 'subscribers',
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 499d74f7b..3bc109fa0 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -191,6 +191,8 @@ class ProfileList extends Widget
 
         $this->out->elementEnd('div');
 
+        $this->out->elementStart('div', 'entity_actions');
+
         if ($user && $user->id != $this->profile->id) {
             # XXX: special-case for user looking at own
             # subscriptions page
@@ -201,8 +203,13 @@ class ProfileList extends Widget
                 $sf = new SubscribeForm($this->out, $this->profile);
                 $sf->show();
             }
+            if ($user && $user->id == $this->owner->id) {
+                $this->showBlockForm();
+            }
         }
 
+        $this->out->elementEnd('div');
+
         $this->out->elementEnd('li');
     }