From 426a86ab1e4fc2488215a9adab4511a59646a413 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 24 Nov 2008 10:20:41 -0600
Subject: prefer autoloaded html scanner

---
 actionpack/lib/action_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller.rb')

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!
-- 
cgit v1.2.3