cleanup photo menus

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
old mode 100755 (executable)
new mode 100644 (file)
index 551b307..690a995
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -37,7 +37,11 @@ function notifications_post(&$a) {
                                intval($intro_id)
                        );      
                        if(! $fid) {
-                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+
+                               // The check for blocked and pending is in case the friendship was already approved
+                               // and we just want to get rid of the now pointless notification
+
+                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", 
                                        intval($contact_id),
                                        intval(local_user())
                                );