diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
| commit | 9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78 (patch) | |
| tree | 5a711cacac76a83ad12551023da8524f94e7365b /actionpack/lib/action_controller/new_base/url_for.rb | |
| parent | dc7323efd34327c13d26031b68e51314c24360f6 (diff) | |
| parent | 9537fd0e3a7625afe4bee75d749647ca1837195a (diff) | |
| download | rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.gz rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.bz2 rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/new_base/url_for.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/url_for.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/new_base/url_for.rb index 94de9fab50..7119c14cd3 100644 --- a/actionpack/lib/action_controller/new_base/url_for.rb +++ b/actionpack/lib/action_controller/new_base/url_for.rb @@ -1,5 +1,9 @@ module ActionController module UrlFor + extend ActiveSupport::Concern + + include RackConvenience + def process_action(*) initialize_current_url super @@ -21,7 +25,7 @@ module ActionController # by this method. def default_url_options(options = nil) end - + def rewrite_options(options) #:nodoc: if defaults = default_url_options(options) defaults.merge(options) @@ -29,7 +33,7 @@ module ActionController options end end - + def url_for(options = {}) options ||= {} case options @@ -42,4 +46,4 @@ module ActionController end end end -end
\ No newline at end of file +end |