Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1021 from raxoft/patch-1
Fix duplicate caching of some templates
  • Loading branch information
Zachary Scott committed May 9, 2016
2 parents e25edc8 + dbddc23 commit 1ae202f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/sinatra/base.rb
Expand Up @@ -804,7 +804,8 @@ def render(engine, data, options = {}, locals = {}, &block)
layout = engine_options[:layout] if layout.nil? or (layout == true && engine_options[:layout] != false)
layout = @default_layout if layout.nil? or layout == true
layout_options = options.delete(:layout_options) || {}
content_type = options.delete(:content_type) || options.delete(:default_content_type)
content_type = options.delete(:default_content_type)
content_type = options.delete(:content_type) || content_type
layout_engine = options.delete(:layout_engine) || engine
scope = options.delete(:scope) || self
options.delete(:layout)
Expand Down

0 comments on commit 1ae202f

Please sign in to comment.