From 2fcb5922c3ff883960f1dbb0aa63c2597dc38f15 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 2 Jun 2011 17:41:04 -0700 Subject: [PATCH] don't notify failed FB delivery of likes, which have no id. --- addon/facebook/facebook.php | 5 +++-- boot.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 00098a7ddc..3cc40330c3 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -438,7 +438,7 @@ function facebook_post_hook(&$a,&$b) { logger('facebook reply id=' . $reply); } - if($b['private'] && $reply == false) { + if($b['private'] && $reply === false) { $allow_people = expand_acl($b['allow_cid']); $allow_groups = expand_groups(expand_acl($b['allow_gid'])); $deny_people = expand_acl($b['deny_cid']); @@ -636,7 +636,8 @@ function facebook_post_hook(&$a,&$b) { } else { // FIXME queue the message so we can attempt to redeliver, see include/notifier.php and include/queue.php - notice( t('Facebook delivery failed.') . EOL); + if(! $likes) + notice( t('Facebook delivery failed.') . EOL); } logger('Facebook post returns: ' . $x, LOGGER_DEBUG); diff --git a/boot.php b/boot.php index ea119411e2..0af73c4684 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.998' ); +define ( 'FRIENDIKA_VERSION', '2.2.999' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1059 );