From ff410c4ea9ea54b3f4b9d5838703a4b039a1cf3f Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Fri, 15 Jul 2011 23:06:37 +0530 Subject: Revert "Fix wildcard route code examples." This reverts commit 0894d73c7552a4c7d576b7d3692c6a18faadd273. Reason: CHANGELOGs should not be changed in docrails. --- actionpack/CHANGELOG | 4 ++-- railties/guides/source/routing.textile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9d320ddb8d..b0f7d0bc11 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -101,11 +101,11 @@ For example if you have this route: - match '*pages' => 'pages#show' + map '*pages' => 'pages#show' by requesting '/foo/bar.json', your `params[:pages]` will be equals to "foo/bar" with the request format of JSON. If you want the old 3.0.x behavior back, you could supply `:format => false` like this: - match '*pages' => 'pages#show', :format => false + map '*pages' => 'pages#show', :format => false * Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile index 57e390f385..06b3579720 100644 --- a/railties/guides/source/routing.textile +++ b/railties/guides/source/routing.textile @@ -560,13 +560,13 @@ would match +zoo/woo/foo/bar/baz+ with +params[:a]+ equals +"zoo/woo"+, and +par NOTE: Starting from Rails 3.1, wildcard routes will always match the optional format segment by default. For example if you have this route: -match '*pages' => 'pages#show' +map '*pages' => 'pages#show' NOTE: By requesting +"/foo/bar.json"+, your +params[:pages]+ will be equals to +"foo/bar"+ with the request format of JSON. If you want the old 3.0.x behavior back, you could supply +:format => false+ like this: -match '*pages' => 'pages#show', :format => false +map '*pages' => 'pages#show', :format => false h4. Redirection -- cgit v1.2.3