aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-30 15:13:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-30 15:13:44 +0000
commit11de94748e1543065748637b083984a69350b1a6 (patch)
tree5f3cec2cfb626ffa18c2933c28b7355a71fbdbc9 /railties/environments
parent241b842be101064ea94943dba0ac7831a96284ad (diff)
downloadrails-11de94748e1543065748637b083984a69350b1a6.tar.gz
rails-11de94748e1543065748637b083984a69350b1a6.tar.bz2
rails-11de94748e1543065748637b083984a69350b1a6.zip
Run set load path so others can do boot and get path
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2429 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/boot.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
index 7f30e829a9..1df433a7eb 100644
--- a/railties/environments/boot.rb
+++ b/railties/environments/boot.rb
@@ -1,8 +1,10 @@
-RAILS_ROOT = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(RAILS_ROOT)
-unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+if File.directory?("#{RAILS_ROOT}/vendor/rails")
+ require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+else
require 'rubygems'
require 'initializer'
-else
- require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-end \ No newline at end of file
+end
+
+Rails::Initializer.run(:set_load_path) \ No newline at end of file