Fix a deprecation warning in Rails 2.3.6 and newer

quasor · Jun 17, 2010 · 051457b · 051457b
1 parent a78232c
commit 051457b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
@@ -18,8 +18,11 @@ def html_safe(text)
     end
 
     def rails_safe_buffer_class
-      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
-      ActiveSupport::SafeBuffer
+      # It's important that we check ActiveSupport first,
+      # because in Rails 2.3.6 ActionView::SafeBuffer exists
+      # but is a deprecated proxy object.
+      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
+      return ActionView::SafeBuffer
     end
 
   end