From f4860d3fd0d3e4f437a82a1b0c8bb00328c51c66 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 27 Oct 2014 21:44:30 +0100 Subject: [PATCH] Remote-self: relocated the code (may now work?) --- include/items.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/include/items.php b/include/items.php index 2999a535b4..d9b4212f74 100644 --- a/include/items.php +++ b/include/items.php @@ -2619,27 +2619,32 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) $notify = true; } + if (!isset($datarray["app"]) OR ($datarray["app"] == "")) + $datarray["app"] = network_to_name($contact['network']); + if ($contact['network'] === NETWORK_FEED) $datarray['private'] = 0; elseif ($notify) { - // At first store the original post - $r = item_store($datarray, false, false); + $datarray2 = $datarray; - // Then create a new guid and uri and post it again as a forwarded post - $datarray["guid"] = get_guid(32); - $datarray["uri"] = item_new_uri($a->get_hostname(),$importer['uid']); + // Create a new guid and uri and post it as a forwarded post + $datarray2["guid"] = get_guid(32); + $datarray2["uri"] = item_new_uri($a->get_hostname(),$importer['uid']); $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`", intval($importer['uid'])); if (count($r)) { - $datarray['contact-id'] = $r[0]["id"]; + $datarray2['contact-id'] = $r[0]["id"]; - $datarray['owner-name'] = $r[0]["name"]; - $datarray['owner-link'] = $r[0]["url"]; - $datarray['owner-avatar'] = $r[0]["photo"]; + $datarray2['owner-name'] = $r[0]["name"]; + $datarray2['owner-link'] = $r[0]["url"]; + $datarray2['owner-avatar'] = $r[0]["photo"]; } - } - if (!isset($datarray["app"]) OR ($datarray["app"] == "")) - $datarray["app"] = network_to_name($contact['network']); + // Store the forwarded post + $r = item_store($datarray2, false, true); + + // Let the original item just be a regular item + $notify = false; + } } else $notify = false; -- 2.39.5