aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-02 17:41:04 -0700
committerFriendika <info@friendika.com>2011-06-02 17:41:04 -0700
commit2fcb5922c3ff883960f1dbb0aa63c2597dc38f15 (patch)
tree22dd8f3cc8f988e5100f19a5cbcd66f7e202b11a
parent558962169ffe947906703f179d81aabccbd84a24 (diff)
downloadvolse-hubzilla-2fcb5922c3ff883960f1dbb0aa63c2597dc38f15.tar.gz
volse-hubzilla-2fcb5922c3ff883960f1dbb0aa63c2597dc38f15.tar.bz2
volse-hubzilla-2fcb5922c3ff883960f1dbb0aa63c2597dc38f15.zip
don't notify failed FB delivery of likes, which have no id.
-rw-r--r--addon/facebook/facebook.php5
-rw-r--r--boot.php2
2 files changed, 4 insertions, 3 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 00098a7dd..3cc40330c 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 ea119411e..0af73c468 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 );