X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=c55100c96a3a5b54cc323d645012e72a3e9a0539;hb=5e6e92a10bbca8e2beb44b4d2aa0ae772eb56295;hp=e3392668e639443e75bf6f26d9d44c172c4e3f68;hpb=4cba826a2fbe958e5c20c645db7e6932f8736f32;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index e3392668e6..c55100c96a 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -29,15 +29,15 @@ function hub_post_return() {
 function pubsub_init(&$a) {
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	if($_SERVER['REQUEST_METHOD'] === 'GET') {
 
-		$hub_mode = notags(trim($_GET['hub_mode']));
-		$hub_topic = notags(trim($_GET['hub_topic']));
-		$hub_challenge = notags(trim($_GET['hub_challenge']));
-		$hub_lease = notags(trim($_GET['hub_lease_seconds']));
-		$hub_verify = notags(trim($_GET['hub_verify_token']));
+		$hub_mode      = ((x($_GET,'hub_mode'))          ? notags(trim($_GET['hub_mode']))          : '');
+		$hub_topic     = ((x($_GET,'hub_topic'))         ? notags(trim($_GET['hub_topic']))         : '');
+		$hub_challenge = ((x($_GET,'hub_challenge'))     ? notags(trim($_GET['hub_challenge']))     : '');
+		$hub_lease     = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : '');
+		$hub_verify    = ((x($_GET,'hub_verify_token'))  ? notags(trim($_GET['hub_verify_token']))  : '');
 
 		logger('pubsub: Subscription from' . $_SERVER['REMOTE_ADDR'] . print_r($_GET,true));
 
@@ -75,8 +75,7 @@ function pubsub_init(&$a) {
 			intval($contact['id'])
 		);
 
- 		hub_return(true, $hub_challenge);
-		
+ 		hub_return(true, $hub_challenge);		
 	}
 }
 
@@ -91,7 +90,7 @@ function pubsub_post(&$a) {
 	logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($nick)
@@ -114,7 +113,11 @@ function pubsub_post(&$a) {
 
 	require_once('include/items.php');
 
-	consume_feed($xml,$importer,$contact,$feedhub);
+	consume_feed($xml,$importer,$contact,$feedhub,1);
+
+	// do it a second time so that any children find their parents.
+
+	consume_feed($xml,$importer,$contact,$feedhub,1);
 
 	hub_post_return();