diff options
| author | Friendika <info@friendika.com> | 2011-04-28 03:14:30 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-28 03:14:30 -0700 |
| commit | 38cb0a329527a07ab82c812001d22eae572d6f82 (patch) | |
| tree | b2c0f4db25f4012c5c6aed56cf5c5a156c1cd46e | |
| parent | 0377b6cdadfc7872ccb2a95d4f6ff5aed81d06ad (diff) | |
| download | volse-hubzilla-38cb0a329527a07ab82c812001d22eae572d6f82.tar.gz volse-hubzilla-38cb0a329527a07ab82c812001d22eae572d6f82.tar.bz2 volse-hubzilla-38cb0a329527a07ab82c812001d22eae572d6f82.zip | |
implement contact block/ignore for NETWORK_FACEBOOK
| -rw-r--r-- | addon/facebook/facebook.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 0a1f5238e..26ec8c597 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -594,7 +594,7 @@ function fb_consume_stream($uid,$j,$wall = false) { if($from->id == $self_id) $datarray['contact-id'] = $self[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($from->id), intval($uid) ); @@ -671,7 +671,7 @@ function fb_consume_stream($uid,$j,$wall = false) { if($likes->id == $self_id) $likedata['contact-id'] = $self[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($likes->id), intval($uid) ); @@ -724,7 +724,7 @@ function fb_consume_stream($uid,$j,$wall = false) { elseif(is_array($orig_post) && (x($orig_post,'contact-id'))) $cmntdata['contact-id'] = $orig_post['contact-id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($cmnt->from->id), intval($uid) ); |