fixing a bad merge

formtastic · Dec 20, 2010 · 99ee8ba · 99ee8ba
1 parent 59c1fce
commit 99ee8ba
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
@@ -1694,7 +1694,7 @@ def get_maxlength_for(method)
         if type == :text
           { :rows => default_text_area_height, 
             :cols => default_text_area_width }
-        elsif type == :numeric || column.nil? || column.limit.nil?
+        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
           { :maxlength => validation_max_limit,
             :size => default_text_field_size }
         else