Merge pull request #846 from sholden/master

Fix template cache memory leak
sinatra · Feb 21, 2014 · c2ba3c2 · c2ba3c2
2 parents f335ed3 + f50af1d
commit c2ba3c2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -809,7 +809,7 @@ def render(engine, data, options = {}, locals = {}, &block)
 
       # render layout
       if layout
-        options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope).
+        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