| @@ -282,16 +282,13 @@ | ||
| 282 | 282 | if ( ! is_array( $append ) ) { |
| 283 | 283 | $append = array( $append ); |
| 284 | 284 | } |
| 285 | 285 | foreach ( $append as $key => $value ) { |
| 286 | - if ( ! array_key_exists( $key, $base ) && ! is_numeric( $key ) ) { | |
| 286 | + if ( ! array_key_exists( $key, $base ) and ! is_numeric( $key ) ) { | |
| 287 | 287 | $base[ $key ] = $append[ $key ]; |
| 288 | 288 | continue; |
| 289 | 289 | } |
| 290 | - if ( is_array( $value ) || ( array_key_exists( $key, $base ) && is_array( $base[ $key ] ) ) ) { | |
| 291 | - if ( ! isset( $base[ $key ] ) ) { | |
| 292 | - $base[ $key ] = array(); | |
| 293 | - } | |
| 290 | + if ( is_array( $value ) or ( array_key_exists( $key, $base ) and is_array( $base[ $key ] ) ) ) { | |
| 294 | 291 | $base[ $key ] = self::array_merge_recursive_distinct( $base[ $key ], $append[ $key ] ); |
| 295 | 292 | } else if ( is_numeric( $key ) ) { |
| 296 | 293 | if ( ! in_array( $value, $base ) ) { |
| 297 | 294 | $base[] = $value; |
| @@ -331,5 +328,6 @@ | ||
| 331 | 328 | |
| 332 | 329 | return array_pop( $args ); |
| 333 | 330 | } |
| 334 | 331 | } |
| 332 | + | |
| 335 | 333 | } |
