diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-06-14 21:12:29 +0200 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-06-14 21:36:04 +0200 |
| commit | 00c3a7eb4c8eb7442705dc11d87d7bda3c69bd57 (patch) | |
| tree | edcb315d7f0d466c91f07e7bcbc49cdb933cbc97 /ocs/providers.php | |
| parent | 479e31997f0ecde8d3cf59cc54c5f8ac4b1f80d8 (diff) | |
| download | nextcloud-server-00c3a7eb4c8eb7442705dc11d87d7bda3c69bd57.tar.gz nextcloud-server-00c3a7eb4c8eb7442705dc11d87d7bda3c69bd57.zip | |
Fix HTTP client given options being overriden by default options
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'ocs/providers.php')
0 files changed, 0 insertions, 0 deletions