X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=fdacd2b2bf484bb8bb52128d0f906e549ee7dcf7;hb=b8f85f0484fbb1f37e9cae2f4cf98f9349fda099;hp=71767e8cef788be4cfa1f90b7c189d7dac63ad13;hpb=17490fca33fb162fab2c9a20727024192b729ac5;p=friendica.git diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php index 71767e8cef..fdacd2b2bf 100644 --- a/src/Core/UserImport.php +++ b/src/Core/UserImport.php @@ -7,6 +7,7 @@ namespace Friendica\Core; use Friendica\App; use Friendica\Database\DBA; use Friendica\Database\DBStructure; +use Friendica\DI; use Friendica\Model\Photo; use Friendica\Object\Image; use Friendica\Util\Strings; @@ -85,12 +86,11 @@ class UserImport /** * @brief Import account file exported from mod/uexport * - * @param App $a Friendica App Class * @param array $file array from $_FILES * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function importAccount(App $a, $file) + public static function importAccount($file) { Logger::log("Start user import from " . $file['tmp_name']); /* @@ -123,7 +123,7 @@ class UserImport } $oldbaseurl = $account['baseurl']; - $newbaseurl = System::baseUrl(); + $newbaseurl = DI::baseUrl(); $oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl)); $newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl)); @@ -282,6 +282,6 @@ class UserImport Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $newuid); info(L10n::t("Done. You can now login with your username and password")); - $a->internalRedirect('login'); + DI::baseUrl()->redirect('login'); } }