diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-16 23:44:28 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-16 23:44:28 +0100 |
| commit | 17c8cba3a04d715e1063e5adea2b22abce417527 (patch) | |
| tree | a733a5c24ba1411968e448185a7097be1151e63a /actionpack/lib | |
| parent | 0fc3381aa5359f31b36057d7bfba2e0eb6a3c064 (diff) | |
| parent | 46f30f902fb5e705683dea19ec22179c61e5f208 (diff) | |
| download | rails-17c8cba3a04d715e1063e5adea2b22abce417527.tar.gz rails-17c8cba3a04d715e1063e5adea2b22abce417527.tar.bz2 rails-17c8cba3a04d715e1063e5adea2b22abce417527.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/routing/segments.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing/segments.rb b/actionpack/lib/action_controller/routing/segments.rb index b142d18b47..864e068004 100644 --- a/actionpack/lib/action_controller/routing/segments.rb +++ b/actionpack/lib/action_controller/routing/segments.rb @@ -249,7 +249,7 @@ module ActionController end def extract_value - "#{local_name} = hash[:#{key}] && hash[:#{key}].collect { |path_component| URI.escape(path_component, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}" + "#{local_name} = hash[:#{key}] && hash[:#{key}].collect { |path_component| URI.escape(path_component.to_param, ActionController::Routing::Segment::UNSAFE_PCHAR) }.to_param #{"|| #{default.inspect}" if default}" end def default diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 9d220c546a..55d2a68327 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -454,7 +454,7 @@ module ActionView ( # leading text <\w+.*?>| # leading HTML tag, or [^=!:'"/]| # leading punctuation, or - ^ # beginning of line + | # nothing ) ( (?:https?://)| # protocol spec, or |