fix args passed to view.context()

jonschlinkert · jonschlinkert · commit ad38d08bf989 · 2017-02-10T13:51:07.000-05:00
diff --git a/lib/plugins/context.js b/lib/plugins/context.js
@@ -68,7 +68,7 @@ module.exports = function(app) {
     if (typeof view.context !== 'function') {
       view.context = View.context;
     }
-    return utils.merge({}, this.cache.data, view.context(locals));
+    return view.context(this.cache.data, locals);
   });
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ module.exports = function(app) {`
`68`	`68`	`if (typeof view.context !== 'function') {`
`69`	`69`	`view.context = View.context;`
`70`	`70`	`}`
`71`		`- return utils.merge({}, this.cache.data, view.context(locals));`
	`71`	`+ return view.context(this.cache.data, locals);`
`72`	`72`	`});`
`73`	`73`
`74`	`74`	`/**`