Merge pull request #2149 from annando/issue-1921

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index 6808c706fab7240d8c7707bf23bb515615f7f785..78471af1514461d33cdef9a13f7b1e5bd31503e8 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