diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
| commit | 7324e46a3fe7be282deeda14783f4170ccf03a3c (patch) | |
| tree | 79968712783f47c816d81e97604f77ff7d920b40 /actionpack/lib/action_controller/vendor | |
| parent | 1fee2fb996229236fb236bcef423930fdf1dfe2d (diff) | |
| parent | 6e039e863a5d71f2a516be2eef2605be23281290 (diff) | |
| download | rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.gz rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.bz2 rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base/mime_responds.rb
Diffstat (limited to 'actionpack/lib/action_controller/vendor')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb index ae20f9947c..a992f7d912 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb @@ -73,7 +73,7 @@ module HTML # Specifies the default Set of tags that the #sanitize helper will allow unscathed. self.allowed_tags = Set.new(%w(strong em b i p code pre tt samp kbd var sub - sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr + sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dl dt dd abbr acronym a img blockquote del ins)) # Specifies the default Set of html attributes that the #sanitize helper will leave |