Merge branch 'mention_branch' into 'nightly'

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

diff --git a/lib/noticestream.php b/lib/noticestream.php
index 0f53daf83f407e15a878d747d1268b972eb451c9..01c5ee4a72e56e970aec2db641f26daf63b3300d 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -46,12 +46,17 @@ if (!defined('STATUSNET')) {
  */
 abstract class NoticeStream
 {
-    // Will only get notices with the 'post' activityverb by default.
-    protected $selectVerbs = array();
+    protected $selectVerbs   = null;    // must be set to array
+    protected $unselectVerbs = null;    // must be set to array
 
     public function __construct()
     {
-        $this->selectVerbs = array(ActivityVerb::POST, ActivityUtils::resolveUri(ActivityVerb::POST, true));
+        if ($this->selectVerbs === null) {
+            $this->selectVerbs = array(ActivityVerb::POST, ActivityUtils::resolveUri(ActivityVerb::POST, true));
+        }
+        if ($this->unselectVerbs === null) {
+            $this->unselectVerbs = array(ActivityVerb::DELETE);
+        }
     }
 
     abstract function getNoticeIds($offset, $limit, $since_id, $max_id);