From bc8a273ec21c5631bbe0d4cbded7ce6355098818 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 22 Jul 2009 14:54:58 +0000 Subject: merge revision(s) 23504: * lib/rexml/text.rb (REXML::Text.normalize): call to_s for input. [ruby-talk:337069] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/rexml/text.rb | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2679295a66..f50466572c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 22 23:39:34 2009 Yukihiro Matsumoto + + * lib/rexml/text.rb (REXML::Text.normalize): call to_s for input. + [ruby-talk:337069] + Tue Jul 21 18:21:47 2009 Nobuyoshi Nakada * lib/mkmf.rb (SRC_EXT): should be flat. diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb index 2bc00429b3..a4a30b6d54 100644 --- a/lib/rexml/text.rb +++ b/lib/rexml/text.rb @@ -286,7 +286,7 @@ module REXML EREFERENCE = /&(?!#{Entity::NAME};)/ # Escapes all possible entities def Text::normalize( input, doctype=nil, entity_filter=nil ) - copy = input + copy = input.to_s # Doing it like this rather than in a loop improves the speed #copy = copy.gsub( EREFERENCE, '&' ) copy = copy.gsub( "&", "&" ) diff --git a/version.h b/version.h index fd747dd6e5..e608829c77 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-07-21" +#define RUBY_RELEASE_DATE "2009-07-22" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090721 -#define RUBY_PATCHLEVEL 187 +#define RUBY_RELEASE_CODE 20090722 +#define RUBY_PATCHLEVEL 188 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3