Fix conflict with assert_tag and Glue gem (closes rails#2255) [david.…

…felstead@gmail.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
JEG2 · Nov 7, 2005 · 8dda7c5 · 8dda7c5
1 parent 6c434e8
commit 8dda7c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com]
+
 * Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 [Jamis Buck]
 
 * Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson]

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
@@ -1,5 +1,5 @@
-require 'html/tokenizer'
-require 'html/node'
+require File.dirname(__FILE__) + '/tokenizer'
+require File.dirname(__FILE__) + '/node'
 
 module HTML #:nodoc: