| 
                                                        @@ -179,7 +179,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    179
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    179
                                                                                                                                                                                                 | 
                                                                  */  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    180
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    180
                                                                                                                                                                                                 | 
                                                                 protected function cleanAttributesIgnored($attributes)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    181
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    181
                                                                                                                                                                                                 | 
                                                                 { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    182
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if(is_array($this->timestamp_fields) && count($this->timestamp_fields) > 0) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    182
                                                                                                                                                                                                 | 
                                                            +        if (is_array($this->timestamp_fields) && count($this->timestamp_fields) > 0) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    183
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    183
                                                                                                                                                                                                 | 
                                                                         $this->ignored = array_merge($this->ignored, $this->timestamp_fields);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    184
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    184
                                                                                                                                                                                                 | 
                                                                     }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    185
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    185
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -201,12 +201,12 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    201
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    201
                                                                                                                                                                                                 | 
                                                                  */  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    202
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    202
                                                                                                                                                                                                 | 
                                                                 protected function cleanAttributesOverride($attributes)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    203
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    203
                                                                                                                                                                                                 | 
                                                                 { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    204
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        if (sizeof($this->override) > 0 && sizeof($attributes) >0) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    204
                                                                                                                                                                                                 | 
                                                            +        if (sizeof($this->override) > 0 && sizeof($attributes) > 0) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    205
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    205
                                                                                                                                                                                                 | 
                                                                         foreach ($this->override as $field => $queryParams) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    206
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    206
                                                                                                                                                                                                 | 
                                                                             $newOverrideValues = $this->getNewOverrideValues($attributes[$field], $queryParams);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    207
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    207
                                                                                                                                                                                                 | 
                                                                             $saveField = \yii\helpers\ArrayHelper::getValue($queryParams, 'saveField', $field);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    208
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    208
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    209
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -                if (count($newOverrideValues) >1) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    209
                                                                                                                                                                                                 | 
                                                            +                if (count($newOverrideValues) > 1) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    210
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    210
                                                                                                                                                                                                 | 
                                                                                 $attributes[$saveField] = implode(', ', | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    211
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    211
                                                                                                                                                                                                 | 
                                                                                                     \yii\helpers\ArrayHelper::map($newOverrideValues, $queryParams['returnField'], $queryParams['returnField'])  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    212
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    212
                                                                                                                                                                                                 | 
                                                                                 );  | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.