Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index 51672d92b6a27919704028408f8aa550b94e719c..b774d78c6d6e5578060e541833d75e8e09add95d 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -78,7 +78,7 @@ function import_cleanup($newuid) {
        q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);\r
 }\r
 \r
-function import_account(&$a, $file) {\r
+function import_account(App $a, $file) {\r
        logger("Start user import from " . $file['tmp_name']);\r
        /*\r
          STEPS\r
@@ -133,7 +133,7 @@ function import_account(&$a, $file) {
        }\r
 \r
        $oldbaseurl = $account['baseurl'];\r
-       $newbaseurl = $a->get_baseurl();\r
+       $newbaseurl = App::get_baseurl();\r
        $olduid = $account['user']['uid'];\r
 \r
         unset($account['user']['uid']);\r
@@ -290,5 +290,5 @@ function import_account(&$a, $file) {
        proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);\r
 \r
        info(t("Done. You can now login with your username and password"));\r
-       goaway($a->get_baseurl() . "/login");\r
+       goaway(App::get_baseurl() . "/login");\r
 }\r