aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-08-21 22:59:42 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-08-21 22:59:42 +0000
commit5f163d256c718596d5848d60e7cf8c400f622bb7 (patch)
treec70552d11818eb9f4655971a4f313275f8585459 /actionpack
parentd24c73dedb681551b7e48d3aa4c79d84df089b85 (diff)
downloadrails-5f163d256c718596d5848d60e7cf8c400f622bb7.tar.gz
rails-5f163d256c718596d5848d60e7cf8c400f622bb7.tar.bz2
rails-5f163d256c718596d5848d60e7cf8c400f622bb7.zip
Back out of [7300] -- it screwed up nested XML
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7357 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
index 22df33afbe..b950e84628 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
@@ -58,9 +58,6 @@ module HTML #:nodoc:
elsif @scanner.scan(/!/) # doctype
tag << @scanner.matched
tag << consume_quoted_regions
- elsif @scanner.scan(/\?/) # processing instructions, drop them
- tag = ''
- @scanner.scan_until(/\/>/)
else
tag << consume_quoted_regions
end