aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/core_ext/class/removal.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/removal.rb b/activesupport/lib/active_support/core_ext/class/removal.rb
index 42cb9f6e4e..628781669d 100644
--- a/activesupport/lib/active_support/core_ext/class/removal.rb
+++ b/activesupport/lib/active_support/core_ext/class/removal.rb
@@ -11,12 +11,12 @@ class Class #:nodoc:
klasses.each do |klass|
# Skip this class if there is nothing bound to this name
next unless defined?(klass.name)
-
+
basename = klass.to_s.split("::").last
parent = klass.parent
-
+
# Skip this class if it does not match the current one bound to this name
- next unless klass = parent.const_get(basename)
+ next unless parent.const_defined?(basename) && klass = parent.const_get(basename)
parent.send :remove_const, basename unless parent == klass
end