Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 39f794a045d722567076812dca1f29e5a50a1194..adf337dfc8bca8c655ccb61330001a771e25a1b5 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.