mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user