From 63389ba23d7a8d6d46cc5cdbabc56069e41c74a9 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 30 Nov 2016 04:30:48 +0000 Subject: [PATCH] Pending or blocked - that's the question ... --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 250691a180..f8facc5741 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -885,7 +885,7 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { $clean_url = normalise_link($item['author-link']); if (local_user()) { - $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `blocked` LIMIT 1", + $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); if ($r) { $best_url = 'redir/'.$r[0]['id'];