|
@@ 1319-1323 (lines=5) @@
|
| 1316 |
|
parse_str( $pair, $params ); |
| 1317 |
|
|
| 1318 |
|
$k = key( $params ); |
| 1319 |
|
if ( ! isset( $result[ $k ] ) ) { |
| 1320 |
|
$result += $params; |
| 1321 |
|
} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) { |
| 1322 |
|
$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] ); |
| 1323 |
|
} |
| 1324 |
|
} |
| 1325 |
|
return true; |
| 1326 |
|
} |
|
@@ 1427-1431 (lines=5) @@
|
| 1424 |
|
$merged = $array1; |
| 1425 |
|
|
| 1426 |
|
foreach ( $array2 as $key => &$value ) { |
| 1427 |
|
if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1428 |
|
$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1429 |
|
} else { |
| 1430 |
|
$merged[ $key ] = $value; |
| 1431 |
|
} |
| 1432 |
|
} |
| 1433 |
|
|
| 1434 |
|
return $merged; |