|
@@ 1263-1267 (lines=5) @@
|
| 1260 |
|
parse_str( $pair, $params ); |
| 1261 |
|
|
| 1262 |
|
$k = key( $params ); |
| 1263 |
|
if ( ! isset( $result[ $k ] ) ) { |
| 1264 |
|
$result += $params; |
| 1265 |
|
} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) { |
| 1266 |
|
$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] ); |
| 1267 |
|
} |
| 1268 |
|
} |
| 1269 |
|
return true; |
| 1270 |
|
} |
|
@@ 1371-1375 (lines=5) @@
|
| 1368 |
|
$merged = $array1; |
| 1369 |
|
|
| 1370 |
|
foreach ( $array2 as $key => &$value ) { |
| 1371 |
|
if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1372 |
|
$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1373 |
|
} else { |
| 1374 |
|
$merged[ $key ] = $value; |
| 1375 |
|
} |
| 1376 |
|
} |
| 1377 |
|
|
| 1378 |
|
return $merged; |