Skip to content

separate locals from config values #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

separate locals from config values #2648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,16 @@ app.render = function(name, options, fn){
var cache = this.cache;
var engines = this.engines;
var view;
var cleanLocals = {};

// saving a clean copy of locals
if (this.locals) {
merge(cleanLocals, this.locals);
}

if (options._locals) {
merge(cleanLocals, options._locals);
}

// support callback function as second arg
if ('function' == typeof options) {
Expand All @@ -532,6 +542,9 @@ app.render = function(name, options, fn){
// merge options
merge(opts, options);

// export a clean copy of the locals, separate from express settings
opts.locals = cleanLocals;

// set .cache unless explicitly provided
opts.cache = null == opts.cache
? this.enabled('view cache')
Expand Down