aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-15 17:04:02 -0700
committerFriendika <info@friendika.com>2011-05-15 17:04:02 -0700
commit31d53c5b2a2d0832878cd813eee55023c52d5b36 (patch)
treec10ff5fa14897a4785541ae0fbbcdc449db21c3d
parent730322ee5fd1b04a026ce6d0bafae9079f307a4b (diff)
downloadvolse-hubzilla-31d53c5b2a2d0832878cd813eee55023c52d5b36.tar.gz
volse-hubzilla-31d53c5b2a2d0832878cd813eee55023c52d5b36.tar.bz2
volse-hubzilla-31d53c5b2a2d0832878cd813eee55023c52d5b36.zip
comments imported from ignored FB contact
-rw-r--r--addon/facebook/facebook.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 2aab3c5ee..ebb0c5344 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -778,12 +778,15 @@ function fb_consume_stream($uid,$j,$wall = false) {
$cmntdata['contact-id'] = $self[0]['id'];
}
else {
- $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
dbesc($cmnt->from->id),
intval($uid)
);
- if(count($r))
+ if(count($r)) {
$cmntdata['contact-id'] = $r[0]['id'];
+ if($r[0]['blocked'] || $r[0]['readonly'])
+ continue;
+ }
}
if(! x($cmntdata,'contact-id'))
$cmntdata['contact-id'] = $orig_post['contact-id'];