Skip to content

Commit

Permalink
Fix param merging
Browse files Browse the repository at this point in the history
  • Loading branch information
zackseuberling committed May 31, 2019
1 parent 8d0b92b commit 8ba044a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/core/mergeConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ module.exports = function mergeConfig(config1, config2) {
config2 = config2 || {};
var config = {};

utils.forEach(['url', 'method', 'params', 'data'], function valueFromConfig2(prop) {
utils.forEach(['url', 'method', 'data'], function valueFromConfig2(prop) {
if (typeof config2[prop] !== 'undefined') {
config[prop] = config2[prop];
}
});

utils.forEach(['headers', 'auth', 'proxy'], function mergeDeepProperties(prop) {
utils.forEach(['headers', 'auth', 'params', 'proxy'], function mergeDeepProperties(prop) {
if (utils.isObject(config2[prop])) {
config[prop] = utils.deepMerge(config1[prop], config2[prop]);
} else if (typeof config2[prop] !== 'undefined') {
Expand Down

0 comments on commit 8ba044a

Please sign in to comment.