mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
bd73142bcf
cURL options are numeric, and array_merge is destructive of numeric keys. Replace array_merge calls with array union operator, with defaults on right-hand side so that passed options override defaults. |
||
---|---|---|
.. | ||
DataFormatter.php | ||
FormEncodedDataFormatter.php | ||
JSONDataFormatter.php | ||
RestfulService.php | ||
RSSFeed.php | ||
XMLDataFormatter.php |