We don't need to check if the format exists to generate the url, it already does it internally

1 files changed, 7 insertions, 8 deletions

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 8abf0bfa59..3ebc6601e5 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -324,14 +324,13 @@ module ActionView
 
         as = options[:as]
         action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :put] : [:new, :post]
-        html_options = { :class  => as ? "#{as}_#{action}" : dom_class(object, action),
-                         :id     => as ? "#{as}_#{action}" : dom_id(object, action),
-                         :method => method }
-        options[:html].reverse_merge!(html_options)
-
-        options[:url] ||= options[:format] ?
-          polymorphic_path(object_or_array, :format => options.delete(:format)) :
-          polymorphic_path(object_or_array)
+        options[:html].reverse_merge!(
+          :class  => as ? "#{as}_#{action}" : dom_class(object, action),
+          :id     => as ? "#{as}_#{action}" : dom_id(object, action),
+          :method => method
+        )
+
+        options[:url] ||= polymorphic_path(object_or_array, :format => options.delete(:format))
       end
       private :apply_form_for_options!