diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
commit | 0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 (patch) | |
tree | 74705adf7f9a35c750f74657f0c4a29a6dcce5ff /actionpack/lib/action_controller.rb | |
parent | 4ac332fa9a16ae86b948251e372999b9f4618dec (diff) | |
download | rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.gz rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.bz2 rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.zip |
Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-x | actionpack/lib/action_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 283238bb93..90c23604db 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -26,14 +26,16 @@ $:.unshift(File.dirname(__FILE__)) unless unless defined?(ActiveSupport) begin - $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") - require 'active_support' + $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" + require 'active_support' rescue LoadError require 'rubygems' require_gem 'activesupport' end end +$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner" + require 'action_controller/base' require 'action_controller/deprecated_redirects' require 'action_controller/request' |