Merge branch 'nginx-sample' into 'nightly'

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

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 733823d21b423058ef20d4f8d7f8a0e99e78e075..b5734b3747ee38900339a480fc2858b25190a1c7 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -28,9 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * A list of the user's subscriptions
@@ -60,7 +58,7 @@ class SubscriptionsAction extends GalleryAction
 
     function showPageNotice()
     {
-        if ($this->scoped instanceof Profile && $this->scoped->id === $this->target->id) {
+        if ($this->scoped instanceof Profile && $this->scoped->sameAs($this->getTarget())) {
             $this->element('p', null,
                            // TRANS: Page notice for page with an overview of all subscriptions
                            // TRANS: of the logged in user's own profile.
@@ -169,23 +167,6 @@ class SubscriptionsList extends SubscriptionList
 
 class SubscriptionsListItem extends SubscriptionListItem
 {
-    function showProfile()
-    {
-        $this->startProfile();
-        $this->showAvatar($this->profile);
-        $this->showFullName();
-        $this->showLocation();
-        $this->showHomepage();
-        $this->showBio();
-        $this->showTags();
-        // Relevant portion!
-        $cur = common_current_user();
-        if (!empty($cur) && $cur->id == $this->owner->id) {
-            $this->showOwnerControls();
-        }
-        $this->endProfile();
-    }
-
     function showOwnerControls()
     {
         $sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
@@ -239,6 +220,5 @@ class SubscriptionsListItem extends SubscriptionListItem
         // TRANS: Save button for settings for a profile in a subscriptions list.
         $this->out->submit('save', _m('BUTTON','Save'));
         $this->out->elementEnd('form');
-        return;
     }
 }