Merge pull request #6926 from MrPetovan/bug/6921-regression-6783
Restore marking thread notifications as seen behavior
This commit is contained in:
commit
c93f527beb
|
@ -5,12 +5,13 @@ Version 2019.06 (UNRELEASED) (2019-06-?)
|
|||
Fixed the notification order [JeroenED]
|
||||
Fixed the timezone of Friendica logs [nupplaphil]
|
||||
Fixed tag completion painfully slow [AlfredSK]
|
||||
Fixed a regression in notifications [MrPetovan]
|
||||
General Code cleaning and restructuring [nupplaphil]
|
||||
Added frio color scheme sharing [JeroenED]
|
||||
Added syslog and stream Logger [nupplaphil]
|
||||
|
||||
Closed Issues:
|
||||
6303, 6478, 6319
|
||||
6303, 6478, 6319, 6921
|
||||
|
||||
Version 2019.03 (2019-03-22)
|
||||
Friendica Core:
|
||||
|
|
|
@ -108,7 +108,13 @@ class NotificationsManager extends BaseObject
|
|||
*/
|
||||
public function setSeen($note, $seen = true)
|
||||
{
|
||||
return DBA::update('notify', ['seen' => $seen], ['link' => $note['link'], 'parent' => $note['parent'], 'otype' => $note['otype'], 'uid' => local_user()]);
|
||||
return DBA::update('notify', ['seen' => $seen], [
|
||||
'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
|
||||
$note['link'],
|
||||
$note['parent'],
|
||||
$note['otype'],
|
||||
local_user()
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user