Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/profilenoticestream.php b/lib/profilenoticestream.php
index 1fa795d32090a55866c49f9221757ab7c089fdcb..3c8de05855bb014eeade3f4f7708d137075be186 100644 (file)
--- a/lib/profilenoticestream.php
+++ b/lib/profilenoticestream.php
@@ -74,7 +74,7 @@ class ProfileNoticeStream extends ScopingNoticeStream
     function getNotices($offset, $limit, $since_id=null, $max_id=null)
     {
         if ($this->impossibleStream()) {
-            return new ArrayWrapper(array());
+            throw new PrivateStreamException($this->streamProfile, $this->userProfile);
         } else {
             return parent::getNotices($offset, $limit, $since_id, $max_id);
         }
@@ -82,12 +82,8 @@ class ProfileNoticeStream extends ScopingNoticeStream
 
     function impossibleStream() 
     {
-        $user = User::getKV('id', $this->streamProfile->id);
-
-        // If it's a private stream, and no user or not a subscriber
-
-        if (!empty($user) && $user->private_stream && 
-            (empty($this->userProfile) || !$this->userProfile->isSubscribed($this->streamProfile))) {
+        if (!$this->streamProfile->readableBy($this->userProfile)) {
+            // cannot read because it's a private stream and either noone's logged in or they are not subscribers
             return true;
         }