diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
| commit | bae00bb1cc392e1cf408369809b9cf85468bef42 (patch) | |
| tree | 17103af6eeb5de96c72beda1debce28950cc7fea /activesupport/lib/active_support/core_ext/regexp.rb | |
| parent | 93c76b2fb08668bc4b8364cc8051476e6d1d15ba (diff) | |
| parent | ffd2cf167040b60c26d97c01598560c87bd4b2d3 (diff) | |
| download | rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.gz rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.bz2 rails-bae00bb1cc392e1cf408369809b9cf85468bef42.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support/core_ext/regexp.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/regexp.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/regexp.rb b/activesupport/lib/active_support/core_ext/regexp.rb index 1a04c70d87..95d06ee6ee 100644 --- a/activesupport/lib/active_support/core_ext/regexp.rb +++ b/activesupport/lib/active_support/core_ext/regexp.rb @@ -9,6 +9,8 @@ class Regexp #:nodoc: class << self def optionalize(pattern) + return pattern if pattern == "" + case unoptionalize(pattern) when /\A(.|\(.*\))\Z/ then "#{pattern}?" else "(?:#{pattern})?" |