aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 678938af86..8b4819bf65 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,8 +31,6 @@ rescue LoadError
end
end
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner"
-
module ActionController
# TODO: Review explicit to see if they will automatically be handled by
# the initilizer if they are really needed.
@@ -99,6 +97,8 @@ class CGI
end
autoload :Mime, 'action_controller/mime_type'
+
+autoload :HTML, 'action_controller/vendor/html-scanner'
autoload :Rack, 'action_controller/vendor/rack'
ActionController.load_all!