Merge pull request #2767 from tobiasd/20160906-credits

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index 6808c706fab7240d8c7707bf23bb515615f7f785..937a16710a9211214547600da5555b4d13134d69 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -156,7 +156,9 @@ function import_account(&$a, $file) {
        $newuid = last_insert_id();\r
        //~ $newuid = 1;\r
 \r
-\r
+       // Generate a new guid for the account. Otherwise there will be problems with diaspora\r
+       q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",\r
+               dbesc(generate_user_guid()), intval($newuid));\r
 \r
        foreach ($account['profile'] as &$profile) {\r
                foreach ($profile as $k => &$v) {\r
@@ -193,10 +195,10 @@ function import_account(&$a, $file) {
                                        //  send relocate message (below)\r
                                        break;\r
                                case NETWORK_ZOT:\r
-                                       // TODO handle zot network\r
+                                       /// @TODO handle zot network\r
                                        break;\r
                                case NETWORK_MAIL2:\r
-                                       // TODO ?\r
+                                       /// @TODO ?\r
                                        break;\r
                                case NETWORK_FEED:\r
                                case NETWORK_MAIL:\r
@@ -285,7 +287,7 @@ function import_account(&$a, $file) {
        }\r
 \r
        // send relocate messages\r
-       proc_run('php', 'include/notifier.php', 'relocate', $newuid);\r
+       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