Merge pull request #13646 from annando/page-drop

[friendica.git] / src / Protocol / Salmon.php

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 7e91b0e3e0957d95e99e0970a74b601d4dd50d03..5047375ea0fb81c89caccb69a6cc1b87e6d25418 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -85,7 +85,7 @@ class Salmon
                Logger::notice('Key located', ['ret' => $ret]);
 
                if (count($ret) == 1) {
-                       /* We only found one one key so we don't care if the hash matches.
+                       /* We only found one key so we don't care if the hash matches.
                         * If it's the wrong key we'll find out soon enough because
                         * message verification will fail. This also covers some older
                         * software which don't supply a keyhash. As long as they only
@@ -160,7 +160,7 @@ class Salmon
 
                $namespaces = ['me' => ActivityNamespace::SALMON_ME];
 
-               $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
+               $salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
 
                // slap them
                $postResult = DI::httpClient()->post($url, $salmon, [
@@ -187,9 +187,7 @@ class Salmon
                                ]
                        ];
 
-                       $namespaces = ['me' => ActivityNamespace::SALMON_ME];
-
-                       $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
+                       $salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
 
                        // slap them
                        $postResult = DI::httpClient()->post($url, $salmon, [
@@ -214,9 +212,7 @@ class Salmon
                                ]
                        ];
 
-                       $namespaces = ['me' => ActivityNamespace::SALMON_ME];
-
-                       $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
+                       $salmon = XML::fromArray($xmldata, $dummy, false, $namespaces);
 
                        // slap them
                        $postResult = DI::httpClient()->post($url, $salmon, [