From 96f0aad6ec8c3ae94485679ac8092c4089310481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20A=C3=B1asco?= <joseanasco1@gmail.com>
Date: Tue, 23 Dec 2014 09:38:44 -0500
Subject: [PATCH] Remove block from super

---
 .../action_view/helpers/tags/search_field.rb  | 21 +++++++++++--------
 .../action_view/helpers/tags/text_field.rb    |  1 -
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/actionview/lib/action_view/helpers/tags/search_field.rb b/actionview/lib/action_view/helpers/tags/search_field.rb
index 4597cec6fa..a848aeabfa 100644
--- a/actionview/lib/action_view/helpers/tags/search_field.rb
+++ b/actionview/lib/action_view/helpers/tags/search_field.rb
@@ -3,18 +3,21 @@ module ActionView
     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
diff --git a/actionview/lib/action_view/helpers/tags/text_field.rb b/actionview/lib/action_view/helpers/tags/text_field.rb
index 49fc81ec8c..5c576a20ca 100644
--- a/actionview/lib/action_view/helpers/tags/text_field.rb
+++ b/actionview/lib/action_view/helpers/tags/text_field.rb
@@ -11,7 +11,6 @@ module ActionView
           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