From 9271b21d51a25f013f4152542286138c97804ea2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 14 Nov 2018 05:58:03 +0000
Subject: [PATCH] Create a new GUID on user import

---
 src/Core/UserImport.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 5488fe43f0..e774d24861 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -129,6 +129,9 @@ class UserImport
 			$old_handle = $account['user']['nickname'].$oldaddr;
 		}
 
+		// Creating a new guid to avoid problems with Diaspora
+		$account['user']['guid'] = System::createUUID();
+
 		$olduid = $account['user']['uid'];
 
 		unset($account['user']['uid']);