kotovalexarian-likes-github
/
haml--haml
mirror of https://github.com/haml/haml.git
1
0
Fork 0
Code Releases Activity

Merge branch 'stable'

This commit is contained in:
Nathan Weizenbaum 2008-10-02 11:15:00 -07:00
parent 467bc0ad0b 73d823fb1d
commit 03c4fcd564
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/haml/helpers/action_view_mods.rb
View File

@ -68,11 +68,11 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
alias_method :capture_without_haml, :capture
alias_method :capture, :capture_with_haml
def capture_erb_with_buffer_with_haml(*args, &block)
def capture_erb_with_buffer_with_haml(buffer, *args, &block)
if is_haml?
capture_haml_with_buffer(*args, &block)
capture_haml(*args, &block)
else
capture_erb_with_buffer_without_haml(*args, &block)
capture_erb_with_buffer_without_haml(buffer, *args, &block)
end
end
alias_method :capture_erb_with_buffer_without_haml, :capture_erb_with_buffer