diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-14 13:56:46 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-14 13:56:46 +0000 |
| commit | 3cb869eab6fec4b4310079af0409f6139ed7619c (patch) | |
| tree | 72d1b67938875d8666b8fa79b04c1c0bb052c81c /actionpack/lib/action_controller/vendor | |
| parent | 75fb0a32a817317ea6ccccfb3ee6b7cd99824ce9 (diff) | |
| download | rails-3cb869eab6fec4b4310079af0409f6139ed7619c.tar.gz rails-3cb869eab6fec4b4310079af0409f6139ed7619c.tar.bz2 rails-3cb869eab6fec4b4310079af0409f6139ed7619c.zip | |
Resync with html-scanner (fix parser bug)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/vendor')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/document.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb index f8a37e9454..c8e07b884c 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb @@ -19,7 +19,7 @@ module HTML #:nodoc: node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token) node_stack.last.children << node unless node.tag? && node.closing == :close - if node.tag? && !node.childless? + if node.tag? if node_stack.length > 1 && node.closing == :close if node_stack.last.name == node.name node_stack.pop @@ -38,7 +38,7 @@ ignoring attempt to close #{node_stack.last.name} with #{node.name} EOF strict ? raise(msg) : warn(msg) end - elsif node.closing != :close + elsif !node.childless? && node.closing != :close node_stack.push node end end |