diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-09-17 09:30:18 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-09-17 09:30:18 +0000 |
| commit | 7cb26b5d2d0ecb4945f01b1aa1d398eb85c9f1a4 (patch) | |
| tree | 24f361b1f6e4e6738ebb71344dcb61f0ac2f50fa /actionpack/lib/action_controller/url_rewriter.rb | |
| parent | acbec3e565909da5811488e88066a01f71b68a94 (diff) | |
| download | rails-7cb26b5d2d0ecb4945f01b1aa1d398eb85c9f1a4.tar.gz rails-7cb26b5d2d0ecb4945f01b1aa1d398eb85c9f1a4.tar.bz2 rails-7cb26b5d2d0ecb4945f01b1aa1d398eb85c9f1a4.zip | |
Disable optimisation code for UrlWriter as request.host doesn't make sense there.
Don't try to use the .to_query method when the route has no dynamic segments.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7501 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/url_rewriter.rb')
| -rw-r--r-- | actionpack/lib/action_controller/url_rewriter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb index 8248696431..7aae619681 100644 --- a/actionpack/lib/action_controller/url_rewriter.rb +++ b/actionpack/lib/action_controller/url_rewriter.rb @@ -21,9 +21,13 @@ module ActionController self.default_url_options = {} def self.included(base) #:nodoc: - ActionController::Routing::Routes.install_helpers base + original_optimise = ActionController::Routing.optimise_named_routes + ActionController::Routing.optimise_named_routes = false + ActionController::Routing::Routes.install_helpers base, :regenerate base.mattr_accessor :default_url_options base.default_url_options ||= default_url_options + ensure + ActionController::Routing.optimise_named_routes = original_optimise end # Generate a url based on the options provided, default_url_options and the |