Merge pull request #3786 from tobiasd/3.5.4-CHANGELOG

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 2830d807d656fcb54dceeb7d28dbf4d70d9c02d6..af014c47fe1cd71a0d083892974200faf9c33210 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1326,12 +1326,11 @@ class Diaspora {
         * @brief Receives account migration
         *
         * @param array $importer Array of the importer user
-        * @param string $sender The sender of the message
         * @param object $data The message object
         *
         * @return bool Success
         */
-       private static function receiveAccountMigration($importer, $sender, $data) {
+       private static function receiveAccountMigration($importer, $data) {
                $old_handle = notags(unxmlify($data->author));
                $new_handle = notags(unxmlify($data->profile->author));
                $signature = notags(unxmlify($data->signature));
@@ -1397,9 +1396,9 @@ class Diaspora {
                                                $n, dbesc($f[0]),
                                                intval($importer["uid"]));
 
-                                       if ($x === false) {
-                                               return false;
-                                       }
+                               if ($x === false) {
+                                       return false;
+                               }
                        }
                }
 
@@ -3072,7 +3071,7 @@ class Diaspora {
 
                logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
 
-               return self::build_and_transmit($owner, $contact, "account_migration", $message, true);
+               return self::build_and_transmit($owner, $contact, "account_migration", $message);
        }
 
        /**