diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
commit | 90870d4872dbc8ff408183a79fd005b905aa86c2 (patch) | |
tree | cdd66eea79a7638b520576d381d08368b05a19c1 /mod/pubsub.php | |
parent | e88a8564c849b199ca552fa307f385b422d5d00a (diff) | |
parent | 5cb0b0ed4591a578720e0c985974db2d95f3810a (diff) | |
download | volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.gz volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.bz2 volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.zip |
Merge branch 'master' of git://github.com/friendika/Free-Friendika
Diffstat (limited to 'mod/pubsub.php')
-rw-r--r-- | mod/pubsub.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mod/pubsub.php b/mod/pubsub.php index b2f006927..93d50ef90 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -69,8 +69,13 @@ function pubsub_init(&$a) { // We must initiate an unsubscribe request with a verify_token. // Don't allow outsiders to unsubscribe us. - if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) - hub_return(false, ''); + if($hub_mode === 'unsubscribe') { + if(! strlen($hub_verify)) { + logger('pubsub: bogus unsubscribe'); + hub_return(false, ''); + } + logger('pubsub: unsubscribe success'); + } $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1", intval($subscribe), @@ -132,11 +137,11 @@ function pubsub_post(&$a) { require_once('include/items.php'); - consume_feed($xml,$importer,$contact,$feedhub,1); + consume_feed($xml,$importer,$contact,$feedhub,1,1); // do it a second time so that any children find their parents. - consume_feed($xml,$importer,$contact,$feedhub,1); + consume_feed($xml,$importer,$contact,$feedhub,1,2); hub_post_return(); |