Merge pull request #6131 from annando/diaspora-relocation
Create a new GUID on user import
This commit is contained in:
		
				commit
				
					
						89cc79b77b
					
				
			
		
					 1 changed files with 4 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -7,6 +7,7 @@ namespace Friendica\Core;
 | 
			
		|||
use Friendica\App;
 | 
			
		||||
use Friendica\Core\Logger;
 | 
			
		||||
use Friendica\Core\Protocol;
 | 
			
		||||
use Friendica\Core\System;
 | 
			
		||||
use Friendica\Database\DBA;
 | 
			
		||||
use Friendica\Model\Photo;
 | 
			
		||||
use Friendica\Object\Image;
 | 
			
		||||
| 
						 | 
				
			
			@ -129,6 +130,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']);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue