diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-14 02:01:05 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-14 02:01:05 +0000 |
commit | e9969414bbf3a3c386d2c3f56fea33eb7f5d67a7 (patch) | |
tree | 1fddfeb9d25b4e59eabdcf01b3c36ae32727362f | |
parent | 4e75451a163bb439b6f5c92abe97338143a2ce16 (diff) | |
download | ruby-e9969414bbf3a3c386d2c3f56fea33eb7f5d67a7.tar.gz |
* lib/erb.rb (ERB::Util.html_escape): fix r36687: call to_s before
passing it to CGI.escapeHTML.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/erb.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Aug 14 10:38:17 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/erb.rb (ERB::Util.html_escape): fix r36687: call to_s before + passing it to CGI.escapeHTML. + Mon Aug 13 13:13:19 2012 Shugo Maeda <shugo@ruby-lang.org> * lib/erb.rb (ERB::Util.html_escape): use CGI.escape to escape diff --git a/lib/erb.rb b/lib/erb.rb index d30911e0f1..26c34ee3ad 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -911,7 +911,7 @@ class ERB # is a > 0 & a < 10? # def html_escape(s) - CGI.escapeHTML(s) + CGI.escapeHTML(s.to_s) end alias h html_escape module_function :h |