From 9d9e26317a611a393d966e80ec4620304baff67e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 14 Jul 2016 07:55:36 +0000 Subject: [PATCH] Don't use alias_chain_method. git-svn-id: http://svn.redmine.org/redmine/trunk@15660 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/10-patches.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index ef8b930ef..671b6df40 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -70,35 +70,35 @@ module ActionView module Tags class Base private - def add_options_with_non_empty_blank_option(option_tags, options, value = nil) + alias :add_options_without_non_empty_blank_option :add_options + def add_options(option_tags, options, value = nil) if options[:include_blank] == true options = options.dup options[:include_blank] = ' '.html_safe end add_options_without_non_empty_blank_option(option_tags, options, value) end - alias_method_chain :add_options, :non_empty_blank_option end end module FormTagHelper - def select_tag_with_non_empty_blank_option(name, option_tags = nil, options = {}) + alias :select_tag_without_non_empty_blank_option :select_tag + def select_tag(name, option_tags = nil, options = {}) if options.delete(:include_blank) options[:prompt] = ' '.html_safe end select_tag_without_non_empty_blank_option(name, option_tags, options) end - alias_method_chain :select_tag, :non_empty_blank_option end module FormOptionsHelper - def options_for_select_with_non_empty_blank_option(container, selected = nil) + alias :options_for_select_without_non_empty_blank_option :options_for_select + def options_for_select(container, selected = nil) if container.is_a?(Array) container = container.map {|element| element.blank? ? [" ".html_safe, ""] : element} end options_for_select_without_non_empty_blank_option(container, selected) end - alias_method_chain :options_for_select, :non_empty_blank_option end end end -- 2.39.5