best_link_url: don't use redirect for pending contacts

diff --git a/include/conversation.php b/include/conversation.php
index 0340ad3e4a8c8e74f3cde7f8cbcd843fef63c052..9d7b474af998b51fca9a49ef36e2f8ee06fda299 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -887,7 +887,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 `pending` LIMIT 1",
                        dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
                if ($r) {
                        $best_url = 'redir/'.$r[0]['id'];