diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2013-03-04 20:17:17 -0800 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2013-03-04 20:17:17 -0800 |
commit | 40936da37222f3a669505b8e428062c4118ca30e (patch) | |
tree | a6a93d0246c5abf34422c6ef6aa534913d53134f | |
parent | 5807513048b16a278bd10f26cb0fc5b3a0bacbec (diff) | |
parent | cc986db54665c4155f1b8da5d3f2ebf4a55ef23f (diff) | |
download | rails-40936da37222f3a669505b8e428062c4118ca30e.tar.gz rails-40936da37222f3a669505b8e428062c4118ca30e.tar.bz2 rails-40936da37222f3a669505b8e428062c4118ca30e.zip |
Merge pull request #9554 from tmm1/string-gsub-hash
Use 1.9 String#gsub syntax
-rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 4 |
1 files changed, 2 insertions, 2 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 5f85cedcf5..dc033ed11b 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -42,7 +42,7 @@ class ERB # html_escape_once('<< Accept & Checkout') # # => "<< Accept & Checkout" def html_escape_once(s) - result = s.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP) { |special| HTML_ESCAPE[special] } + result = s.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE) s.html_safe? ? result.html_safe : result end @@ -60,7 +60,7 @@ class ERB # json_escape('{"name":"john","created_at":"2010-04-28T01:39:31Z","id":1}') # # => {name:john,created_at:2010-04-28T01:39:31Z,id:1} def json_escape(s) - result = s.to_s.gsub(JSON_ESCAPE_REGEXP) { |special| JSON_ESCAPE[special] } + result = s.to_s.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE) s.html_safe? ? result.html_safe : result end |