diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-29 22:33:09 +0000 |
| commit | 20d850dac78fc11512a6ad9f3d2ad397daac3e87 (patch) | |
| tree | d982ec813560600d21edfe3ad1597d2c83af1df1 /actionpack/lib/action_controller/url_rewriter.rb | |
| parent | 6932ae4b2978de6771e6d1c84cfc3595cf9d8bab (diff) | |
| parent | b3bc4fa5e02e71a992f8a432757548c762f0aad8 (diff) | |
| download | rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.gz rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.tar.bz2 rails-20d850dac78fc11512a6ad9f3d2ad397daac3e87.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/url_rewriter.rb')
| -rw-r--r-- | actionpack/lib/action_controller/url_rewriter.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb index d86e2db67d..bb6cb437b7 100644 --- a/actionpack/lib/action_controller/url_rewriter.rb +++ b/actionpack/lib/action_controller/url_rewriter.rb @@ -92,15 +92,12 @@ module ActionController # end # end module UrlWriter - # The default options for urls written by this writer. Typically a <tt>:host</tt> - # pair is provided. - mattr_accessor :default_url_options - self.default_url_options = {} - def self.included(base) #:nodoc: ActionController::Routing::Routes.install_helpers(base) base.mattr_accessor :default_url_options - base.default_url_options ||= default_url_options + + # The default options for urls written by this writer. Typically a <tt>:host</tt> pair is provided. + base.default_url_options ||= {} end # Generate a url based on the options provided, default_url_options and the |