aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-09-05 09:44:22 +0000
committerJamis Buck <jamis@37signals.com>2005-09-05 09:44:22 +0000
commitbfdb4375089cb16abd0a44e1a98194666986f491 (patch)
tree6fee19f3a71add6c51c08b97db4cb9a7a9a49be3 /actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
parent873be1258e5150a5e0decaf76cfa0c04c01ba54c (diff)
downloadrails-bfdb4375089cb16abd0a44e1a98194666986f491.tar.gz
rails-bfdb4375089cb16abd0a44e1a98194666986f491.tar.bz2
rails-bfdb4375089cb16abd0a44e1a98194666986f491.zip
Updated vendor copy of html-scanner to support better xml parsing
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner/html/node.rb')
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner/html/node.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6d045b0367..f0f94d19cc 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -271,7 +271,8 @@ module HTML #:nodoc:
end
# Returns non-+nil+ if this tag can contain child nodes.
- def childless?
+ def childless?(xml = false)
+ return false if xml && @closing.nil?
!@closing.nil? ||
@name =~ /^(img|br|hr|link|meta|area|base|basefont|
col|frame|input|isindex|param)$/ox