X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fconversationnoticestream.php;h=21b2d7f0be59a0561e6ecf1994cfcc7e89a451dd;hb=0b9a2fdf3ad19942e85a66b94d08501ce9c927dd;hp=27489a42dfe777be9017c4f53d142fdbbbfbb158;hpb=5ebe01ba365886bf19edbb1dc5f5591c2135a8be;p=quix0rs-gnu-social.git diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php index 27489a42df..21b2d7f0be 100644 --- a/lib/conversationnoticestream.php +++ b/lib/conversationnoticestream.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); } /** * Notice stream for a conversation @@ -73,6 +69,7 @@ class RawConversationNoticeStream extends NoticeStream function __construct($id) { + parent::__construct(); $this->id = $id; } @@ -95,9 +92,7 @@ class RawConversationNoticeStream extends NoticeStream $notice->limit($offset, $limit); } - if (!empty($this->selectVerbs)) { - $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb')); - } + self::filterVerbs($notice, $this->selectVerbs); // ORDER BY // currently imitates the previously used "_reverseChron" sorting