| 
                                                        @@ -147,7 +147,7 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    147
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    147
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    148
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    148
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    149
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    149
                                                                                                                                                                                                 | 
                                                                     // load the entity type code from the configuration  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    150
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        $entityTypeCode =  $entityType ? $entityType[MemberNames::ENTITY_TYPE_CODE] : $this->getConfiguration()->getConfiguration()->getEntityTypeCode();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    150
                                                                                                                                                                                                 | 
                                                            +        $entityTypeCode = $entityType ? $entityType[MemberNames::ENTITY_TYPE_CODE] : $this->getConfiguration()->getConfiguration()->getEntityTypeCode();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    151
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    151
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    152
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    152
                                                                                                                                                                                                 | 
                                                                     // try to map the entity type code  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    153
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    153
                                                                                                                                                                                                 | 
                                                                     if (isset($this->entityTypeCodeToAttributeSetMappings[$entityTypeCode])) { | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.