Merge branch 'doc-backup-restore-def-vals' into 'nightly'

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

diff --git a/lib/groupnoticestream.php b/lib/groupnoticestream.php
index c75d62141950f33a2be0bcd58a7d4bbe4f1c7835..2d6e7b37cb4b6328b928e8d69ead7c631c4df739 100644 (file)
--- a/lib/groupnoticestream.php
+++ b/lib/groupnoticestream.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Stream of notices for a group
@@ -47,19 +43,14 @@ if (!defined('STATUSNET')) {
 class GroupNoticeStream extends ScopingNoticeStream
 {
     var $group;
-    var $userProfile;
 
-    function __construct($group, $profile = -1)
+    function __construct($group, Profile $scoped=null)
     {
-        if (is_int($profile) && $profile == -1) {
-            $profile = Profile::current();
-        }
         $this->group = $group;
-        $this->userProfile = $profile;
 
         parent::__construct(new CachingNoticeStream(new RawGroupNoticeStream($group),
                                                     'user_group:notice_ids:' . $group->id),
-                            $profile);
+                            $scoped);
     }
 
     function getNoticeIds($offset, $limit, $since_id, $max_id)
@@ -74,7 +65,7 @@ class GroupNoticeStream extends ScopingNoticeStream
     function getNotices($offset, $limit, $sinceId = null, $maxId = null)
     {
         if ($this->impossibleStream()) {
-            return array();
+            return new ArrayWrapper(array());
         } else {
             return parent::getNotices($offset, $limit, $sinceId, $maxId);
         }
@@ -83,7 +74,7 @@ class GroupNoticeStream extends ScopingNoticeStream
     function impossibleStream() 
     {
         if ($this->group->force_scope &&
-            (empty($this->userProfile) || !$this->userProfile->isMember($group))) {
+            (!$this->scoped instanceof Profile || $this->scoped->isMember($this->group))) {
             return true;
         }