[Haml] Fixed content_tag bug

(introduced in Rails commit 5ffaaa71d149c9807260c950c9a61d01fe734827)
twalpole · Aug 6, 2009 · 207cf2f · 207cf2f
1 parent 96d5450
commit 207cf2f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/haml/helpers/action_view_mods.rb b/lib/haml/helpers/action_view_mods.rb
@@ -123,8 +123,10 @@ def is_haml?
         @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