diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-06-25 12:12:30 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-06-25 12:12:30 +0100 |
| commit | 01571c0fd73a31f78411d6cad6484ddd82ec4778 (patch) | |
| tree | d0565f7ad3fd5a65aafbf191170094b90d7ef543 /actionpack/lib/action_controller/vendor/html-scanner | |
| parent | b5e9badea281ce0c371ff1c00461febe66f4e2b2 (diff) | |
| parent | 670e22e3724791f51d639f409930fba5af920081 (diff) | |
| download | rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.tar.gz rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.tar.bz2 rails-01571c0fd73a31f78411d6cad6484ddd82ec4778.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/javascript_helper.rb
activesupport/lib/active_support/dependencies.rb
activesupport/lib/active_support/inflector.rb
activesupport/lib/active_support/values/time_zone.rb
Diffstat (limited to 'actionpack/lib/action_controller/vendor/html-scanner')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/document.rb | 2 |
1 files changed, 1 insertions, 1 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 607fd186b9..b8d73c350d 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb @@ -17,7 +17,7 @@ module HTML #:nodoc: @root = Node.new(nil) node_stack = [ @root ] while token = tokenizer.next - node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token) + node = Node.parse(node_stack.last, tokenizer.line, tokenizer.position, token, strict) node_stack.last.children << node unless node.tag? && node.closing == :close if node.tag? |