From 2adeaa9c90b7559387b55e7a24a7eb82671c88cc Mon Sep 17 00:00:00 2001 From: Joshua Ballanco Date: Thu, 14 Apr 2011 23:25:18 -0400 Subject: [PATCH] Fix for stripping tags from frozen strings. This returns behavior under Ruby 1.9 to match Ruby 1.8. --- .../lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 09dd08898c..91a97c02ff 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb @@ -33,7 +33,7 @@ module HTML result = super # strip any comments, and if they have a newline at the end (ie. line with # only a comment) strip that too - result.gsub!(/[\n]?/m, "") if result + result = result.gsub(/[\n]?/m, "") if (result && result =~ /[\n]?/m) # Recurse - handle all dirty nested tags result == text ? result : sanitize(result, options) end