From bd19e93c094b85bc2fb40044d972dcb98ce53d7c Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 17 Nov 2018 01:36:54 +0100 Subject: [PATCH] Minor code relocation https://github.com/friendica/friendica/pull/6144/files#r234385033 --- src/Protocol/OStatus.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 0ea6512d1..a6a5d061c 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1299,6 +1299,10 @@ class OStatus break; } + if (!$feed_mode) { + $selfUri = "/dfrn_poll/" . $owner["nick"]; + } + $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION]; XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]); @@ -1330,9 +1334,6 @@ class OStatus $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"]; XML::addElement($doc, $root, "link", "", $attributes); - if (!$feed_mode) { - $selfUri = "/dfrn_poll/" . $owner["nick"]; - } $attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes);