Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 02:24:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

Browse source
This commit is contained in:
Michael 2018-09-22 15:18:53 +00:00
commit c083ae047c
69 changed files with 16128 additions and 16187 deletions
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.
* @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();
// At first try the Diaspora transport layer
if (!$dissolve) {
if (!$dissolve && !$legacy_transport) {
$ret = self::transmit($owner, $contact, $atom);
if ($ret >= 200) {
logger('Delivery via Diaspora transport layer was successful with status ' . $ret);