| 
                                                        @@ -564,9 +564,11 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    564
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    564
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    565
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    565
                                                                                                                                                                                                 | 
                                                             				$map = $this->getMappedChunk( $list, $mapping );  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    566
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    566
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    567
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				if( isset( $map[0] ) ) // there can only be one chunk for the base product data  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    567
                                                                                                                                                                                                 | 
                                                            +				if( isset( $map[0] ) ) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    568
                                                                                                                                                                                                 | 
                                                            +					// there can only be one chunk for the base product data  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    568
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    569
                                                                                                                                                                                                 | 
                                                             				{ | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    569
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    570
                                                                                                                                                                                                 | 
                                                             					$type = $this->checkType( $this->val( $map[0], 'product.type', $product->getType() ) );  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    571
                                                                                                                                                                                                 | 
                                                            +				}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    570
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    572
                                                                                                                                                                                                 | 
                                                             					$map[0]['product.config'] = json_decode( $map[0]['product.config'] ?? '[]', true ) ?: [];  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    571
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    573
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    572
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    574
                                                                                                                                                                                                 | 
                                                             					$product = $product->fromArray( $map[0], true );  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.