diff options
author | Jamis Buck <jamis@37signals.com> | 2005-11-09 13:42:05 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2005-11-09 13:42:05 +0000 |
commit | b7ce9c5a870c86cd993a8db99aa961510df56864 (patch) | |
tree | 4f22de07fdc16f8d32c310b7eeade6727f91beb1 /actionpack | |
parent | bc7ec23f4ef9ee5f8a8e7ec7b17af6652e4d438e (diff) | |
download | rails-b7ce9c5a870c86cd993a8db99aa961510df56864.tar.gz rails-b7ce9c5a870c86cd993a8db99aa961510df56864.tar.bz2 rails-b7ce9c5a870c86cd993a8db99aa961510df56864.zip |
assert_tag uses exact matches for string conditions, instead of partial matches. Use regex to do partial matches. #2799
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2952 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/node.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 0d7d99236e..aaf2182c60 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* assert_tag uses exact matches for string conditions, instead of partial matches. Use regex to do partial matches. #2799 + * CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default. [nbpwie102@sneakemail.com] * Do not raise an exception when default helper is missing; log a debug message instead. It's nice to delete empty helpers. [Jeremy Kemper] 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 f3e8eb1a22..4f02e2d421 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb @@ -497,7 +497,7 @@ module HTML #:nodoc: def match_condition(value, condition) case condition when String - value && value.index(condition) + value && value == condition when Regexp value && value.match(condition) when Numeric |