diff options
Diffstat (limited to 'activesupport/lib/active_support')
3 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/attr_internal.rb b/activesupport/lib/active_support/core_ext/module/attr_internal.rb index c793da7159..7f2fb9641b 100644 --- a/activesupport/lib/active_support/core_ext/module/attr_internal.rb +++ b/activesupport/lib/active_support/core_ext/module/attr_internal.rb @@ -15,8 +15,8 @@ class Module # Declare attributes backed by 'internal' instance variables names. def attr_internal_accessor(*attrs) - attr_internal_reader *attrs - attr_internal_writer *attrs + attr_internal_reader(*attrs) + attr_internal_writer(*attrs) end alias_method :attr_internal, :attr_internal_accessor diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 99c27ee9d1..99dbad1f7e 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -18,6 +18,7 @@ module ActiveSupport # Have deprecations been silenced? def silenced? + @silenced = false unless defined?(@silenced) @silenced end diff --git a/activesupport/lib/active_support/vendor/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder/xmlbase.rb index 950d5891e1..b0485636ea 100644 --- a/activesupport/lib/active_support/vendor/builder/xmlbase.rb +++ b/activesupport/lib/active_support/vendor/builder/xmlbase.rb @@ -53,7 +53,7 @@ module Builder unless text.nil? raise ArgumentError, "XmlMarkup cannot mix a text argument with a block" end - _capture_outer_self(block) if @self.nil? + _capture_outer_self(block) unless defined?(@self) && !@self.nil? _indent _start_tag(sym, attrs) _newline |