Merge pull request #13027 from akshay-vishnoi/f-refactor

avoiding calling of #option_value_selected? two times
rails · Nov 25, 2013 · f4a5a9e · f4a5a9e
2 parents 7ccb482 + 0f2ef7b
commit f4a5a9e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb
@@ -361,7 +361,7 @@ def options_for_select(container, selected = nil)
           text, value = option_text_and_value(element).map { |item| item.to_s }
 
           html_attributes[:selected] = option_value_selected?(value, selected)
-          html_attributes[:disabled] = disabled && option_value_selected?(value, disabled)
+          html_attributes[:disabled] = disabled && html_attributes[:selected]
           html_attributes[:value] = value
 
           content_tag_string(:option, text, html_attributes)