@@ -3,7 +3,11 @@ module ActionController class Segment #:nodoc: RESERVED_PCHAR = ':@&=+$,;' SAFE_PCHAR = "#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}" - UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze + if RUBY_VERSION >= '1.9' + UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false).freeze + else + UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze + end # TODO: Convert :is_optional accessor to read only attr_accessor :is_optional actionpack/lib/action_controller/routing/segments.rb 763effcb6d6f3145540797d68dda32f539b1d499 Sam Granieri sam@samgranieri.com http://github.com/technoweenie/rails/commit/b6ad4bd0a23f4fcb7201b512445fdb0da33a73bd b6ad4bd0a23f4fcb7201b512445fdb0da33a73bd 2009-02-25T09:39:10-08:00 2009-02-22T19:24:53-08:00 Ruby 1.9 compat: silence a warning about regexp languages [#2050 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> ebb3c7369cc0f8731146235ce69b8b5eea9f5214 Jeremy Kemper jeremy@bitsweat.net