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

Merge pull request #5780 from annando/fix-relocation 

Hopefully fixes relocations that hadn't been executed
This commit is contained in:
Tobias Diekershoff 2018-09-22 10:56:11 +02:00 committed by GitHub
parent 1a16876995 0dbb6313a5
commit 684dfd5bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/DFRN.php
View File

@ -1164,12 +1164,12 @@ class DFRN
* @return int Deliver status. Negative values mean an error. * @return int Deliver status. Negative values mean an error.
* @todo Add array type-hint for $owner, $contact * @todo Add array type-hint for $owner, $contact
*/ */
public static function deliver($owner, $contact, $atom, $dissolve = false) public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
{ {
$a = get_app(); $a = get_app();
// At first try the Diaspora transport layer // At first try the Diaspora transport layer
if (!$dissolve) { if (!$dissolve && !$legacy_transport) {
$ret = self::transmit($owner, $contact, $atom); $ret = self::transmit($owner, $contact, $atom);
if ($ret >= 200) { if ($ret >= 200) {
logger('Delivery via Diaspora transport layer was successful with status ' . $ret); logger('Delivery via Diaspora transport layer was successful with status ' . $ret);

4
src/Worker/Delivery.php
View File

@ -292,8 +292,10 @@ class Delivery extends BaseObject
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return; return;
} }
} else { } elseif ($cmd != self::RELOCATION) {
$deliver_status = DFRN::deliver($owner, $contact, $atom); $deliver_status = DFRN::deliver($owner, $contact, $atom);
} else {
$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
} }
logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);