update from git.gnu.io
This commit is contained in:
parent
f5acc4a386
commit
0e99f04c43
|
@ -390,6 +390,8 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
|
|||
protected $target = null;
|
||||
protected $inbox = null;
|
||||
|
||||
protected $selectVerbs = array();
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
@ -397,6 +399,7 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
|
|||
*/
|
||||
function __construct(Profile $target)
|
||||
{
|
||||
parent::__construct();
|
||||
$this->target = $target;
|
||||
}
|
||||
|
||||
|
@ -453,9 +456,17 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
|
|||
if (!empty($max_id)) {
|
||||
$notice->whereAdd(sprintf('notice.id <= %d', $max_id));
|
||||
}
|
||||
if (!empty($this->selectVerbs)) {
|
||||
|
||||
// We have changed how selectVerbs work in GNUsocial, so it's an associative array
|
||||
// where each verb is in the key and then the value (true/false) is how to filter.
|
||||
// $this->unselectVerbs is always unset in newer GNUsocials.
|
||||
if (!isset($this->unselectVerbs)) {
|
||||
self::filterVerbs($notice, $this->selectVerbs);
|
||||
} elseif (!empty($this->selectVerbs)) {
|
||||
// old behaviour was just if there were selectVerbs set
|
||||
$notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
|
||||
}
|
||||
|
||||
$notice->limit($offset, $limit);
|
||||
// notice.id will give us even really old posts, which were
|
||||
// recently imported. For example if a remote instance had
|
||||
|
|
|
@ -1609,7 +1609,7 @@ body.rtl #history-container.menu-container a .chev-right {
|
|||
border-image-repeat: stretch stretch;
|
||||
border-image-slice: 100% 100% 100% 100%;
|
||||
border-image-source: none;
|
||||
border-image-width: 1 1 1 1:
|
||||
border-image-width: 1 1 1 1;
|
||||
}
|
||||
#feed-header-inner {
|
||||
position:relative;
|
||||
|
@ -1836,7 +1836,7 @@ background-repeat: no-repeat;
|
|||
.stream-item.notification .small-grey-notice,
|
||||
.stream-item.notification .small-grey-notice a {
|
||||
color:#999;
|
||||
word-break: break-all;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
.stream-item.notification .small-grey-notice a:hover {
|
||||
color:#333;
|
||||
|
|
Loading…
Reference in New Issue
Block a user