From: Michael Vogel Date: Tue, 17 Feb 2015 18:27:13 +0000 (+0100) Subject: Removed Statusnet from the counting of contacts for scrape/noscrape X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=219932f692e09924685e34f5866135c6956dd347;p=friendica.git Removed Statusnet from the counting of contacts for scrape/noscrape --- diff --git a/boot.php b/boot.php index d2de87fc60..7ca4865d14 100644 --- a/boot.php +++ b/boot.php @@ -1681,12 +1681,11 @@ if(! function_exists('profile_sidebar')) { if(is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 - AND `network` IN ('%s', '%s', '%s', '%s', '')", + AND `network` IN ('%s', '%s', '%s', '')", intval($profile['uid']), dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_STATUSNET) + dbesc(NETWORK_OSTATUS) ); if(count($r)) $contacts = intval($r[0]['total']); diff --git a/mod/noscrape.php b/mod/noscrape.php index a93abd29a8..170c737767 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -33,12 +33,11 @@ function noscrape_init(&$a) { if(is_array($a->profile) AND !$a->profile['hide-friends']) { $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 - AND `network` IN ('%s', '%s', '%s', '%s', '')", + AND `network` IN ('%s', '%s', '%s', '')", intval($a->profile['uid']), dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_STATUSNET) + dbesc(NETWORK_OSTATUS) ); if(count($r)) $json_info["contacts"] = intval($r[0]['total']);