diff options
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' |