diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-24 14:22:44 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-24 14:22:44 -0700 |
| commit | 6eaa9f0dadc9c4667d2040dd862b97bc92bdaf19 (patch) | |
| tree | ccd72db88f25804db08670d79e8ae54c85ae174f | |
| parent | d54ff41f8e0588df0d6e2f48554f62e1176a873e (diff) | |
| parent | f9164749625df8585696857c93484a5b5e2307c6 (diff) | |
| download | rails-6eaa9f0dadc9c4667d2040dd862b97bc92bdaf19.tar.gz rails-6eaa9f0dadc9c4667d2040dd862b97bc92bdaf19.tar.bz2 rails-6eaa9f0dadc9c4667d2040dd862b97bc92bdaf19.zip | |
Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s
remove superfluous to_s in ERB::Util.html_escape
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 94999807dd..2daf4016cd 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -20,7 +20,7 @@ class ERB if s.html_safe? s else - s.to_s.gsub(/&/, "&").gsub(/\"/, """).gsub(/>/, ">").gsub(/</, "<").html_safe + s.gsub(/&/, "&").gsub(/\"/, """).gsub(/>/, ">").gsub(/</, "<").html_safe end end |