missing linebreaks and a small typo

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index b27f9dc12607d52ed20402915de4947955c8548f..78b20bd691fefe7694aab86948d74443aba59bc5 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,18 +1,17 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
-       global $db;
-
        if (IMPORT_DEBUG) {
                return 1;
        }
 
-       return $db->insert_id();
+       return dba::lastInsertId();
 }
 
 function last_error() {
@@ -125,7 +124,7 @@ function import_account(App $a, $file) {
        }
 
        $oldbaseurl = $account['baseurl'];
-       $newbaseurl = App::get_baseurl();
+       $newbaseurl = System::baseUrl();
        $olduid = $account['user']['uid'];
 
        unset($account['user']['uid']);
@@ -279,5 +278,5 @@ function import_account(App $a, $file) {
        proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
 
        info(t("Done. You can now login with your username and password"));
-       goaway(App::get_baseurl() . "/login");
+       goaway(System::baseUrl() . "/login");
 }