Somehow the changes of pull request 2748 got vanished

diff --git a/include/conversation.php b/include/conversation.php
index c073117efd9c47b9e5bfd853c6184a05fa7c47c6..250691a18026be899dbbcdb2715e9e9bb988421f 100644 (file)
--- 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'];