Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/inboxtagcloudsection.php b/lib/inboxtagcloudsection.php
index d19f76366d6f09d072f8f04218d83d0c4f465d54..4268ee48548722093c6f67a2a799b9e891b97cdd 100644 (file)
--- a/lib/inboxtagcloudsection.php
+++ b/lib/inboxtagcloudsection.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Personal tag cloud section
@@ -60,9 +58,9 @@ class InboxTagCloudSection extends TagCloudSection
 
     function getTags()
     {
-        $profile = Profile::current();
-
-        $stream = new InboxNoticeStream($this->target, $profile);
+        // FIXME: Get the Profile::current() value some other way
+        // to avoid confusion between background stuff and session.
+        $stream = new InboxNoticeStream($this->target, Profile::current());
 
         $ids = $stream->getNoticeIds(0, self::MAX_NOTICES, null, null);