kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Let's keep default_options renderer agnostic

Browse source
This commit is contained in:
Blake Mizerany 2008-04-19 14:07:12 -07:00
parent 3a38dc3491
commit f80203adb6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/sinatra.rb
View file

@ -604,7 +604,7 @@ module Sinatra
private
def render_haml(content, options = {}, &b)
haml_options = (options[:options] || {}).merge(Sinatra.options.haml)
haml_options = (options[:options] || {}).merge(Sinatra.options.haml || {})
::Haml::Engine.new(content, haml_options).render(options[:scope] || self, options[:locals] || {}, &b)
end
@ -838,8 +838,7 @@ module Sinatra
:views => root + '/views',
:public => root + '/public',
:sessions => false,
:logging => true,
:haml => {}
:logging => true
}
end