Skip to content
Browse files

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
  • Loading branch information...
1 parent 21d50e4 commit 19f59b6eb1eb83fb6b903ccdd4690f925c4ee247 @jeremy jeremy committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/dependencies.rb
View
2 activesupport/lib/active_support/dependencies.rb
@@ -43,7 +43,7 @@ def clear
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)

0 comments on commit 19f59b6

Please sign in to comment.
Something went wrong with that request. Please try again.