diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-23 22:33:45 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-23 22:33:45 +0000 |
| commit | 19f59b6eb1eb83fb6b903ccdd4690f925c4ee247 (patch) | |
| tree | 56eb3cba438d0d6fdbeedc8ee28e325dc8d85456 /activesupport | |
| parent | 21d50e4d1a07566939e11f6911279e562565e176 (diff) | |
| download | rails-19f59b6eb1eb83fb6b903ccdd4690f925c4ee247.tar.gz rails-19f59b6eb1eb83fb6b903ccdd4690f925c4ee247.tar.bz2 rails-19f59b6eb1eb83fb6b903ccdd4690f925c4ee247.zip | |
Dependencies: set load_file_name = file_name if it ends in .rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index ed32334240..be44f61ea7 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -43,7 +43,7 @@ module Dependencies #:nodoc: def require_or_load(file_name) if load? # Append .rb if we have a bare file name. - load_file_name = "#{file_name}.rb" unless file_name[-3..-1] == '.rb' + load_file_name = (file_name =~ /\.rb$/ ? file_name : "#{file_name}.rb") # Enable warnings iff this file has not been loaded before. if history.include?(file_name) |