The object type "photo" is deprecated and was replaced by "image"

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index 937a16710a9211214547600da5555b4d13134d69..0d9ffc35fca2f001fcf6df23db1f03a1e8fd8da5 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -116,7 +116,7 @@ function import_account(&$a, $file) {
                notice(t('Error! Cannot check nickname'));\r
                return;\r
        }\r
-       if (count($r) > 0) {\r
+       if (dbm::is_result($r) > 0) {\r
                notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));\r
                return;\r
        }\r
@@ -127,13 +127,13 @@ function import_account(&$a, $file) {
                notice(t('Error! Cannot check nickname'));\r
                return;\r
        }\r
-       if (count($r) > 0) {\r
+       if (dbm::is_result($r) > 0) {\r
                notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));\r
                return;\r
        }\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