mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
This commit is contained in:
commit
541587db7d
1 changed files with 4 additions and 2 deletions
|
@ -123,8 +123,10 @@ module ActionView
|
|||
@template_object.send :is_haml?
|
||||
end
|
||||
|
||||
alias_method :content_tag_without_haml, :content_tag
|
||||
alias_method :content_tag, :content_tag_with_haml
|
||||
unless defined?(ActionView::Helpers::ActiveRecordInstanceTag)
|
||||
alias_method :content_tag_without_haml, :content_tag
|
||||
alias_method :content_tag, :content_tag_with_haml
|
||||
end
|
||||
end
|
||||
|
||||
module FormTagHelper
|
||||
|
|
Loading…
Add table
Reference in a new issue