diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-23 19:12:00 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-23 19:12:00 -0800 |
commit | 2dd0ec48a5068a095e362fad2a77d63b86fdfd95 (patch) | |
tree | 3a7fdd08f4a7f361d9a263e52f9b0e57c9f191e8 /actionpack/lib/action_view/helpers | |
parent | fb4bb93d439f32421c8836261dce0c7de1addf82 (diff) | |
download | rails-2dd0ec48a5068a095e362fad2a77d63b86fdfd95.tar.gz rails-2dd0ec48a5068a095e362fad2a77d63b86fdfd95.tar.bz2 rails-2dd0ec48a5068a095e362fad2a77d63b86fdfd95.zip |
Autoload HTML::Document and sanitizers
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/sanitize_helper.rb | 11 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 10 |
2 files changed, 1 insertions, 20 deletions
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb index 435ba936e1..200c1d6085 100644 --- a/actionpack/lib/action_view/helpers/sanitize_helper.rb +++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb @@ -1,14 +1,5 @@ require 'action_view/helpers/tag_helper' - -begin - require 'html/document' -rescue LoadError - html_scanner_path = "#{File.dirname(__FILE__)}/../../action_controller/vendor/html-scanner" - if File.directory?(html_scanner_path) - $:.unshift html_scanner_path - require 'html/document' - end -end +require 'action_controller/vendor/html-scanner' module ActionView module Helpers #:nodoc: diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 510c1a6a76..506138a735 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -1,15 +1,5 @@ require 'action_view/helpers/tag_helper' -begin - require 'html/document' -rescue LoadError - html_scanner_path = "#{File.dirname(__FILE__)}/../../action_controller/vendor/html-scanner" - if File.directory?(html_scanner_path) - $:.unshift html_scanner_path - require 'html/document' - end -end - module ActionView module Helpers #:nodoc: # The TextHelper module provides a set of methods for filtering, formatting |