| 
                                                        @@ -338,10 +338,10 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    338
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    338
                                                                                                                                                                                                 | 
                                                             	protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    339
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    339
                                                                                                                                                                                                 | 
                                                             		try { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    340
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    340
                                                                                                                                                                                                 | 
                                                             			if ($member->getSingleId() !== '') { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    341
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				$userId = $member->getSingleId() . '@' . $member->getInstance();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    341
                                                                                                                                                                                                 | 
                                                            +				$userId = $member->getSingleId().'@'.$member->getInstance();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    342
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    342
                                                                                                                                                                                                 | 
                                                             				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    343
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    343
                                                                                                                                                                                                 | 
                                                             			} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    344
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				$userId = $member->getUserId() . '@' . $member->getInstance();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    344
                                                                                                                                                                                                 | 
                                                            +				$userId = $member->getUserId().'@'.$member->getInstance();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    345
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    345
                                                                                                                                                                                                 | 
                                                             				$federatedUser = $this->federatedUserService->getFederatedUser(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    346
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    346
                                                                                                                                                                                                 | 
                                                             					$userId,  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    347
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    347
                                                                                                                                                                                                 | 
                                                             					$member->getUserType()  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.