diff options
author | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
commit | bbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch) | |
tree | c58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/lodash/_baseMerge.js | |
parent | 003fb34971cf63466184351b4db5f7c67df4f444 (diff) |
update packages
Diffstat (limited to 'node_modules/lodash/_baseMerge.js')
-rw-r--r-- | node_modules/lodash/_baseMerge.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node_modules/lodash/_baseMerge.js b/node_modules/lodash/_baseMerge.js index f4cb8c698..c5868f04c 100644 --- a/node_modules/lodash/_baseMerge.js +++ b/node_modules/lodash/_baseMerge.js @@ -3,7 +3,8 @@ var Stack = require('./_Stack'), baseFor = require('./_baseFor'), baseMergeDeep = require('./_baseMergeDeep'), isObject = require('./isObject'), - keysIn = require('./keysIn'); + keysIn = require('./keysIn'), + safeGet = require('./_safeGet'); /** * The base implementation of `_.merge` without support for multiple sources. @@ -27,7 +28,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) { } else { var newValue = customizer - ? customizer(object[key], srcValue, (key + ''), object, source, stack) + ? customizer(safeGet(object, key), srcValue, (key + ''), object, source, stack) : undefined; if (newValue === undefined) { |