GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Replies and Conversation noticestreams should only get POSTs by default

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-07-15 14:27:03 +02:00
parent 9afdc40763
commit 0cefab3603
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/conversationnoticestream.php
View File

@ -73,6 +73,7 @@ class RawConversationNoticeStream extends NoticeStream
function __construct($id)
{
parent::__construct();
$this->id = $id;
}

6
lib/replynoticestream.php
View File

@ -75,6 +75,7 @@ class RawReplyNoticeStream extends NoticeStream
function __construct($userId)
{
parent::__construct();
$this->userId = $userId;
}
@ -86,6 +87,11 @@ class RawReplyNoticeStream extends NoticeStream
Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'modified');
Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'modified');
if (!empty($this->selectVerbs)) {
$reply->joinAdd(array('notice_id', 'notice:id'));
$reply->whereAddIn('notice.verb', $this->selectVerbs, 'string');
}
$reply->orderBy('modified DESC, notice_id DESC');
if (!is_null($offset)) {