Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / accountmover.php

diff --git a/lib/accountmover.php b/lib/accountmover.php
index 429b6c04656f1b00845613148146bc1f89bf792b..f8fb4512bd7c19d791e00266caad21fcbb79b15f 100644 (file)
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -86,7 +86,7 @@ class AccountMover extends QueueHandler
         $qm = QueueManager::get();
 
         foreach ($acts as $act) {
-            $qm->enqueue(array($act, $sink, $user->uri, $remote), 'actmove');
+            $qm->enqueue(array($act, $sink, $user->getUri(), $remote), 'actmove');
         }
 
         $this->log(LOG_INFO,
@@ -114,7 +114,6 @@ class AccountMover extends QueueHandler
             $svcDocUrl = $link->href;
             if (isset($link['http://apinamespace.org/atom/username'])) {
                 $username = $link['http://apinamespace.org/atom/username'];
-                break;
             }
         }