From 624fabf88451a1a56ab2d55a214e74e661535920 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 29 Nov 2016 20:25:27 +0000
Subject: [PATCH] Somehow the changes of pull request 2748 got vanished
---
include/conversation.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/conversation.php b/include/conversation.php
index c073117efd..250691a180 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' LIMIT 1",
+ $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `blocked` LIMIT 1",
dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
if ($r) {
$best_url = 'redir/'.$r[0]['id'];
--
2.39.5