From ff52c2c3dad287dcac10916cf43173fada8e4ad6 Mon Sep 17 00:00:00 2001 From: Sam Granieri Date: Sun, 22 Feb 2009 21:24:53 -0600 Subject: [PATCH] Ruby1.9 Compat: Silence a warning about regexp languages --- .../lib/action_controller/routing/segments.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb index 129e87c..cbb1a9c 100644 --- a/actionpack/lib/action_controller/routing/segments.rb +++ b/actionpack/lib/action_controller/routing/segments.rb @@ -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 -- 1.6.1.3