mirror of
https://github.com/friendica/friendica
synced 2025-04-30 12:24:24 +02:00
Frio: Improved display of disabled activities
This commit is contained in:
parent
89e105afbe
commit
f5f18518da
8 changed files with 54 additions and 30 deletions
|
@ -889,9 +889,10 @@ class Conversation
|
|||
$condition['author-hidden'] = false;
|
||||
}
|
||||
|
||||
if ($this->config->get('system', 'emoji_activities')) {
|
||||
$emojis = $this->getEmojis($uriids);
|
||||
$quoteshares = $this->getQuoteShares($uriids);
|
||||
$emojis = $this->getEmojis($uriids);
|
||||
$quoteshares = $this->getQuoteShares($uriids);
|
||||
|
||||
if (!$this->config->get('system', 'legacy_activities')) {
|
||||
$condition = DBA::mergeConditions($condition, ["(`gravity` != ? OR `origin`)", ItemModel::GRAVITY_ACTIVITY]);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue