propagate default_encoding to Tilt

jaseg · Dec 25, 2010 · f59aad2 · f59aad2
1 parent dacf079
commit f59aad2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -455,7 +455,8 @@ def render_xml(engine, template, options={}, locals={}, &block)
     def render(engine, data, options={}, locals={}, &block)
       # merge app-level options
       options = settings.send(engine).merge(options) if settings.respond_to?(engine)
-      options[:outvar] ||= '@_out_buf'
+      options[:outvar]           ||= '@_out_buf'
+      options[:default_encoding] ||= settings.default_encoding
 
       # extract generic options
       locals          = options.delete(:locals) || locals         || {}