Merge pull request #18166 from merongivian/search_field_refactor

Remove block from super

actionview/lib/action_view/helpers/tags/search_field.rb

@@ -3,18 +3,21 @@ module Helpers
     module Tags # :nodoc:
       class SearchField < TextField # :nodoc:
         def render
-          super do |options|
-            if options["autosave"]
-              if options["autosave"] == true
-                options["autosave"] = request.host.split(".").reverse.join(".")
-              end
-              options["results"] ||= 10
-            end
+          options = @options.stringify_keys
 
-            if options["onsearch"]
-              options["incremental"] = true unless options.has_key?("incremental")
+          if options["autosave"]
+            if options["autosave"] == true
+              options["autosave"] = request.host.split(".").reverse.join(".")
             end
+            options["results"] ||= 10
+          end
+
+          if options["onsearch"]
+            options["incremental"] = true unless options.has_key?("incremental")
           end
+
+          @options = options
+          super
         end
       end
     end

actionview/lib/action_view/helpers/tags/text_field.rb

@@ -11,7 +11,6 @@ def render
           options["size"] = options["maxlength"] unless options.key?("size")
           options["type"] ||= field_type
           options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
-          yield options if block_given?
           add_default_name_and_id(options)
           tag("input", options)
         end