Merge pull request #1809 from annando/issue-1491

We need to generate a new guid to make Diaspora work

diff --git a/include/uimport.php b/include/uimport.php
index 6808c706fab7240d8c7707bf23bb515615f7f785..b8439ee0944c8192fec2557134db68c234f09bcb 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -156,7 +156,8 @@ 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", generate_user_guid(), $newuid);\r
 \r
        foreach ($account['profile'] as &$profile) {\r
                foreach ($profile as $k => &$v) {\r