Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / lib / subscriptionlist.php

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 36dcbf65f81227681a22ae875a9b9a4b8080c946..29c12744076b301527ed8837ced2226ef2e6268e 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/profilelist.php';
-
 /**
  * Widget to show a list of subscriptions
  *
@@ -76,16 +74,25 @@ class SubscriptionListItem extends ProfileListItem
     function showProfile()
     {
         $this->startProfile();
-        $this->showAvatar();
+        $this->showAvatar($this->profile);
+        $this->showNickname();
         $this->showFullName();
         $this->showLocation();
         $this->showHomepage();
         $this->showBio();
         // Relevant portion!
         $this->showTags();
+        if ($this->isOwn()) {
+            $this->showOwnerControls();
+        }
         $this->endProfile();
     }
 
+    function showOwnerControls()
+    {
+        // pass
+    }
+
     function isOwn()
     {
         $user = common_current_user();