Use shallow merge in res.view (re balderdashy#3500)

lennym · Feb 25, 2016 · 57ade9e · 57ade9e
1 parent 9051b2b
commit 57ade9e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/hooks/views/res.view.js b/lib/hooks/views/res.view.js
@@ -150,7 +150,9 @@ module.exports = function _addResViewMethod(req, res, next) {
 
     // Merge with config views locals
     if (sails.config.views.locals) {
-      _.merge(locals, sails.config.views.locals, _.defaults);
+      // Formerly a deep merge: `_.merge(locals, sails.config.views.locals, _.defaults);`
+      // Now shallow- see https://github.com/balderdashy/sails/issues/3500
+      _.defaults(locals, sails.config.views.locals);
     }
 
     // If the path was specified, but invalid