| 
                                                        @@ -56,7 +56,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    56
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    56
                                                                                                                                                                                                 | 
                                                                     $artefacts = array();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    57
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    57
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    58
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    58
                                                                                                                                                                                                 | 
                                                                     // load the attribute option values for the custom store views  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    59
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        $attributeOptionValues = $this->getValue(ColumnKeys::ATTRIBUTE_OPTION_VALUES, array(), function ($value) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    59
                                                                                                                                                                                                 | 
                                                            +        $attributeOptionValues = $this->getValue(ColumnKeys::ATTRIBUTE_OPTION_VALUES, array(), function($value) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    60
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    60
                                                                                                                                                                                                 | 
                                                                         return $this->explode($value, $this->getMultipleFieldDelimiter());  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    61
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    61
                                                                                                                                                                                                 | 
                                                                     });  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    62
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    62
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -68,7 +68,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    68
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    68
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    69
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    69
                                                                                                                                                                                                 | 
                                                                     $adminValueArtefacts = $this->getArtefactsByTypeAndEntityId(AttributeOptionExportObserver::ARTEFACT_TYPE, $this->getLastEntityId());  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    70
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    70
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    71
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if (!$this->isValidateAdminValuesWithStoreOptionValues($adminValueArtefacts, $attributeOptionValues)){ | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    71
                                                                                                                                                                                                 | 
                                                            +        if (!$this->isValidateAdminValuesWithStoreOptionValues($adminValueArtefacts, $attributeOptionValues)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    72
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    72
                                                                                                                                                                                                 | 
                                                                         return;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    73
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    73
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    74
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    74
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.