Remove code duplication between CheckBox ans RadioButton

1 files changed, 3 insertions, 9 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/check_box.rb b/actionpack/lib/action_view/helpers/tags/check_box.rb
index 55574e6f06..2cdc13524b 100644
--- a/actionpack/lib/action_view/helpers/tags/check_box.rb
+++ b/actionpack/lib/action_view/helpers/tags/check_box.rb
@@ -12,21 +12,15 @@ module ActionView
           options = @options.stringify_keys
           options["type"]     = "checkbox"
           options["value"]    = @checked_value
+          options["checked"] = "checked" if input_checked?(object, options)
 
-          if options.has_key?("checked")
-            cv = options.delete "checked"
-            checked = cv == true || cv == "checked"
-          else
-            checked = check_box_checked?(value(object))
-          end
-
-          options["checked"] = "checked" if checked
           if options["multiple"]
             add_default_name_and_id_for_value(@checked_value, options)
             options.delete("multiple")
           else
             add_default_name_and_id(options)
           end
+
           hidden = @unchecked_value ? tag("input", "name" => options["name"], "type" => "hidden", "value" => @unchecked_value, "disabled" => options["disabled"]) : ""
           checkbox = tag("input", options)
           hidden + checkbox
@@ -34,7 +28,7 @@ module ActionView
 
         private
 
-        def check_box_checked?(value)
+        def checked?(value)
           case value
           when TrueClass, FalseClass
             value