aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-10 14:04:05 -0700
committerfriendica <info@friendica.com>2014-10-10 14:04:05 -0700
commitaae1d11de8c6a30c72c6d1362739f3eb13b2696d (patch)
treeb7071efc856fc85aaf78c4500413aae7cbdef1cb
parent5bfde822584b5432a75497afea55af6d0a74472a (diff)
downloadvolse-hubzilla-aae1d11de8c6a30c72c6d1362739f3eb13b2696d.tar.gz
volse-hubzilla-aae1d11de8c6a30c72c6d1362739f3eb13b2696d.tar.bz2
volse-hubzilla-aae1d11de8c6a30c72c6d1362739f3eb13b2696d.zip
reset route to parent route on Diaspora comments flowing upstream so they won't be rejected going downstream
-rwxr-xr-xinclude/diaspora.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index a16c4e0ae..028e2674f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1379,6 +1379,8 @@ function diaspora_comment($importer,$xml,$msg) {
$datarray['mid'] = $guid;
$datarray['parent_mid'] = $parent_item['mid'];
+ // set the route to that of the parent so downstream hubs won't reject it.
+ $datarray['route'] = $parent_item['route'];
// No timestamps for comments? OK, we'll the use current time.
$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert();
@@ -1968,6 +1970,9 @@ function diaspora_like($importer,$xml,$msg) {
$arr['app'] = 'Diaspora';
+ // set the route to that of the parent so downstream hubs won't reject it.
+ $arr['route'] = $parent_item['route'];
+
$arr['item_private'] = $parent_item['item_private'];
$arr['verb'] = $activity;
$arr['obj_type'] = $objtype;
@@ -2446,9 +2451,6 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
else
return;
- // set the route to that of the parent so downstream hubs won't reject it.
-
- $item['route'] = $parent['route'];
if(($item['verb'] === ACTIVITY_LIKE) && ($parent['mid'] === $parent['parent_mid'])) {
$tpl = get_markup_template('diaspora_like.tpl');