From cfdfcb37cbed8354e9f6c025a6e9ccadafc2d625 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 30 Mar 2012 15:10:50 -0700 Subject: [PATCH] don't delete contact from a friend request if friendship was already established --- boot.php | 2 +- mod/notifications.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 1f2b690773..03e88101a6 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1296' ); +define ( 'FRIENDICA_VERSION', '2.3.1297' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1133 ); diff --git a/mod/notifications.php b/mod/notifications.php index 551b307dbd..690a99562f 100755 --- 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()) );