Removed Statusnet from the counting of contacts for scrape/noscrape

diff --git a/boot.php b/boot.php
index d2de87fc608024ba1f27c0e8cd8e50af379b3b90..7ca4865d1461f7eb6de1456dce76c7c81bb42026 100644 (file)
--- 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 a93abd29a8b546154e35124e668b8021bdc73c08..170c7377679b279800ef8e038fc8a3577ecac5f5 100644 (file)
--- 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']);