Only import new OStatus posts if they are from our followers

[friendica.git] / include / identity.php

diff --git a/include/identity.php b/include/identity.php
index d3852b2c2c23415e1c6a6809de88f5cf0ed723a5..8138e9b046871ac8f757082db961201f968c805a 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -374,7 +374,10 @@ function profile_sidebar($profile, $block = 0) {
                        if (dbm::is_result($r))
                                $updated =  date("c", strtotime($r[0]['updated']));
 
-                       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
+                       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+                               WHERE `uid` = %d
+                                       AND NOT `self` AND NOT `blocked` AND NOT `pending`
+                                       AND NOT `hidden` AND NOT `archive`
                                        AND `network` IN ('%s', '%s', '%s', '')",
                                intval($profile['uid']),
                                dbesc(NETWORK_DFRN),
@@ -649,7 +652,7 @@ function advanced_profile(App $a) {
                        $profile['marital']['with'] = $a->profile['with'];
                }
 
-               if (strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
+               if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
                        $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
                }