From 0a8c003b1e0459b5bcfa47f49cc74f7a6b3851f8 Mon Sep 17 00:00:00 2001
From: Sam Granieri <sam@samgranieri.com>
Date: Sun, 22 Feb 2009 21:24:53 -0600
Subject: Ruby 1.9 compat: silence a warning about regexp languages
[#2050 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
actionpack/lib/action_controller/routing/segments.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'actionpack')
diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb
index 129e87c139..cbb1a9c09a 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
--
cgit v1.2.3