Set outvar for any template engine (so it is usable from liquid, text…

…ile and markdown). Also, only set it if not present, allowing to override it.
sinatra · Sep 20, 2010 · f8e0a34 · f8e0a34
1 parent 1cf1c76
commit f8e0a34
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -301,12 +301,10 @@ module Templates
     include Tilt::CompileSite
 
     def erb(template, options={}, locals={})
-      options[:outvar] = '@_out_buf'
       render :erb, template, options, locals
     end
 
     def erubis(template, options={}, locals={})
-      options[:outvar] = '@_out_buf'
       render :erubis, template, options, locals
     end
 
@@ -368,6 +366,7 @@ def coffee(template, options={}, locals={})
     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'
 
       # extract generic options
       locals = options.delete(:locals) || locals || {}