From 4fbd350dca336e5c5b974b42fb97a1d6da74c366 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 25 Aug 2012 03:08:45 +0200 Subject: instead of returning $& if =~ succeeds, use String#[] --- activesupport/lib/active_support/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport') diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index d3a37f28c8..059eb4cd2d 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -443,7 +443,7 @@ module ActiveSupport #:nodoc: def load_file(path, const_paths = loadable_constants_for_path(path)) log_call path, const_paths const_paths = [const_paths].compact unless const_paths.is_a? Array - parent_paths = const_paths.collect { |const_path| /.*(?=::)/ =~ const_path ? $& : :Object } + parent_paths = const_paths.collect { |const_path| const_path[/.*(?=::)/] || :Object } result = nil newly_defined_paths = new_constants_in(*parent_paths) do -- cgit v1.2.3