|
@@ 1276-1280 (lines=5) @@
|
| 1273 |
|
parse_str( $pair, $params ); |
| 1274 |
|
|
| 1275 |
|
$k = key( $params ); |
| 1276 |
|
if ( ! isset( $result[ $k ] ) ) { |
| 1277 |
|
$result += $params; |
| 1278 |
|
} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) { |
| 1279 |
|
$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] ); |
| 1280 |
|
} |
| 1281 |
|
} |
| 1282 |
|
return true; |
| 1283 |
|
} |
|
@@ 1384-1388 (lines=5) @@
|
| 1381 |
|
$merged = $array1; |
| 1382 |
|
|
| 1383 |
|
foreach ( $array2 as $key => &$value ) { |
| 1384 |
|
if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1385 |
|
$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1386 |
|
} else { |
| 1387 |
|
$merged[ $key ] = $value; |
| 1388 |
|
} |
| 1389 |
|
} |
| 1390 |
|
|
| 1391 |
|
return $merged; |