kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

use destructive merge operations on `options` to save new hash creations

This commit is contained in:
Vipul A M 2013-07-21 01:49:15 +05:30
parent 55d1de945e
commit 93480f138c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/sinatra/base.rb
View File

@ -772,7 +772,7 @@ module Sinatra
def render(engine, data, options = {}, locals = {}, &block)
# merge app-level options
engine_options = settings.respond_to?(engine) ? settings.send(engine) : {}
options = engine_options.merge(options)
options.merge!(engine_options) { |key, v1, v2| v1 }
# extract generic options
locals = options.delete(:locals) || locals || {}
@ -804,8 +804,8 @@ module Sinatra
# render layout
if layout
options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
options.merge! layout_options
options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
.merge!(layout_options)
catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
end