naruse	2012-08-14 11:01:05 +0900 (Tue, 14 Aug 2012)

  New Revision: 36690

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36690

  Log:
    * lib/erb.rb (ERB::Util.html_escape): fix r36687: call to_s before
      passing it to CGI.escapeHTML.

  Modified files:
    trunk/ChangeLog
    trunk/lib/erb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36689)
+++ ChangeLog	(revision 36690)
@@ -1,3 +1,8 @@
+Tue Aug 14 10:38:17 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* lib/erb.rb (ERB::Util.html_escape): use CGI.escape to escape
Index: lib/erb.rb
===================================================================
--- lib/erb.rb	(revision 36689)
+++ lib/erb.rb	(revision 36690)
@@ -911,7 +911,7 @@
     #   is a &gt; 0 &amp; a &lt; 10?
     #
     def html_escape(s)
-      CGI.escapeHTML(s)
+      CGI.escapeHTML(s.to_s)
     end
     alias h html_escape
     module_function :h

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/