friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-19 13:36:43 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Notifications do work now again

Browse source
This commit is contained in:
Michael 2019-03-26 21:55:48 +00:00
parent 753b1e0f25
commit 2e0697c70e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/ForumManager.php
View file

@ -199,7 +199,7 @@ class ForumManager
$stmtContacts = DBA::p( $stmtContacts = DBA::p(
"SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item` "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id` INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen` WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`) AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
AND NOT `contact`.`blocked` AND NOT `contact`.`hidden` AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
AND NOT `contact`.`pending` AND NOT `contact`.`archive` AND NOT `contact`.`pending` AND NOT `contact`.`archive`

6
src/Core/NotificationsManager.php
View file

@ -563,7 +563,7 @@ class NotificationsManager extends BaseObject
$sql_extra = ""; $sql_extra = "";
if (!$all) { if (!$all) {
$sql_extra = " AND `ignore` = 0 "; $sql_extra = " AND NOT `ignore` ";
} }
/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
@ -578,8 +578,8 @@ class NotificationsManager extends BaseObject
LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 WHERE `intro`.`uid` = ? $sql_extra AND `intro`.`blocked` = 0
LIMIT %d, %d", LIMIT ?, ?",
intval($_SESSION['uid']), intval($_SESSION['uid']),
intval($start), intval($start),
intval($limit) intval($limit)