Merge pull request #6940 from annando/fix-notif

Notifications do work now again

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index e9dab41ef9a26da1454993918b88f63a54d22a1a..af2c3725c40700f6a3d068d6f348fb4a3c72de1f 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -199,13 +199,13 @@ class ForumManager
                $stmtContacts = DBA::p(
                        "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
                                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 NOT `contact`.`blocked` AND NOT `contact`.`hidden`
                                AND NOT `contact`.`pending` AND NOT `contact`.`archive`
                                AND `contact`.`success_update` > `failure_update`
                                GROUP BY `contact`.`id` ",
-                       intval(local_user())
+                       local_user()
                );
 
                return DBA::toArray($stmtContacts);

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index bc1d1a00aa656993743b993dc9beb002ecbfea48..5b2e97005aec370ea502de52570334963a3fca81 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -563,7 +563,7 @@ class NotificationsManager extends BaseObject
                $sql_extra = "";
 
                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
@@ -578,11 +578,11 @@ class NotificationsManager extends BaseObject
                                LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
                                LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
                                LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0
-                       LIMIT %d, %d",
-                       intval($_SESSION['uid']),
-                       intval($start),
-                       intval($limit)
+                       WHERE `intro`.`uid` = ? $sql_extra AND `intro`.`blocked` = 0
+                       LIMIT ?, ?",
+                       $_SESSION['uid'],
+                       $start,
+                       $limit
                );
                if (DBA::isResult($stmtNotifies)) {
                        $notifs = $this->formatIntros(DBA::toArray($stmtNotifies));