clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1874 from annando/1509-pubsub 

Bugfix: pubsub tend to unsubscribe subscriptions in the past
This commit is contained in:
Tobias Diekershoff 2015-09-01 07:07:22 +02:00
parent bc92b922b4 389738b1c1
commit 658c99dcf3
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/pubsub.php
View File

@ -63,10 +63,11 @@ function pubsub_init(&$a) {
intval($owner['uid']) intval($owner['uid'])
); );
if(! count($r)) { if(! count($r)) {
logger('pubsub: contact not found.'); logger('pubsub: contact '.$contact_id.' not found.');
hub_return(false, ''); hub_return(false, '');
} }
if ($hub_topic)
if(! link_compare($hub_topic,$r[0]['poll'])) { if(! link_compare($hub_topic,$r[0]['poll'])) {
logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
// should abort but let's humour them. // should abort but let's humour them.
@ -85,6 +86,7 @@ function pubsub_init(&$a) {
logger('pubsub: unsubscribe success'); logger('pubsub: unsubscribe success');
} }
if ($hub_mode)
$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d", $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
intval($subscribe), intval($subscribe),
intval($contact['id']) intval($contact['id'])