diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-08-30 23:52:53 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-08-30 23:52:53 +0000 |
| commit | 34e795ff0e8cf91c8bd1e2938d161acafe74e2c0 (patch) | |
| tree | faa4fb7c4ef269822ecb348340f9e98f861d6732 | |
| parent | e6a6b3fc4897be4d63d11cf454deb28406c466d0 (diff) | |
| download | rails-34e795ff0e8cf91c8bd1e2938d161acafe74e2c0.tar.gz rails-34e795ff0e8cf91c8bd1e2938d161acafe74e2c0.tar.bz2 rails-34e795ff0e8cf91c8bd1e2938d161acafe74e2c0.zip | |
Use string key to set action_name for controllers. Closes #1968
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2077 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index dbfa43fde7..f885ec3508 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use string key to obtain action value. Allows indifferent hashes to be disabled. + * Added ActionView::Base.cache_template_loading back. * Rewrote compiled templates to decrease code complexity. Removed template load caching in favour of compiled caching. Fixed template error messages. [Nicholas Seckar] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7da54537d6..2c4de733cc 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -354,7 +354,7 @@ module ActionController #:nodoc: initialize_template_class(response) assign_shortcuts(request, response) initialize_current_url - @action_name = params[:action] || 'index' + @action_name = params['action'] || 'index' @variables_added = nil log_processing if logger |