Merge pull request #9039 from MrPetovan/task/frio-accent-scheme

[friendica.git] / src / Core / UserImport.php

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index ffe680dc4c25782cfc52810a5adb092dbe40771f..ed131910c74c9444cdcd8926d2854ffa7c25f6af 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Core/UserImport.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Core;
 
 use Friendica\App;
@@ -254,7 +271,7 @@ class UserImport
 
                                if ($r === false) {
                                        Logger::log("uimport:insert profile: ERROR : " . DBA::errorMessage(), Logger::INFO);
-                                       info(DI::l10n()->t("User profile creation error"));
+                                       notice(DI::l10n()->t("User profile creation error"));
                                        DBA::delete('user', ['uid' => $newuid]);
                                        DBA::delete('profile_field', ['uid' => $newuid]);
                                        return;
@@ -263,7 +280,7 @@ class UserImport
                                $profile['id'] = DBA::lastInsertId();
                        }
 
-                       DI::profileField()->migrateFromProfile($profile);
+                       DI::profileField()->migrateFromLegacyProfile($profile);
                }
 
                ///@TODO Replace with permissionset import