Merge pull request #1809 from annando/issue-1491

We need to generate a new guid to make Diaspora work

include/uimport.php

@@ -156,7 +156,8 @@ function import_account(&$a, $file) {
 	$newuid = last_insert_id();
 	//~ $newuid = 1;
 
-
+	// Generate a new guid for the account. Otherwise there will be problems with diaspora
+	q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d", generate_user_guid(), $newuid);
 
 	foreach ($account['profile'] as &$profile) {
 		foreach ($profile as $k => &$v) {