aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/pagination.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-07 12:40:14 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-07 12:40:14 +0000
commitc40b1a4a67ccaa3be31edb13399d93da0c628567 (patch)
tree2c943fc5485bb29617911afd8da56bd269103bee /actionpack/lib/action_controller/pagination.rb
parenta3b045a73e729e44719713084462825ef98f8bc0 (diff)
downloadrails-c40b1a4a67ccaa3be31edb13399d93da0c628567.tar.gz
rails-c40b1a4a67ccaa3be31edb13399d93da0c628567.tar.bz2
rails-c40b1a4a67ccaa3be31edb13399d93da0c628567.zip
Deprecate direct usage of @params. Update ActionView::Base for instance var deprecation.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/pagination.rb')
-rw-r--r--actionpack/lib/action_controller/pagination.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/pagination.rb b/actionpack/lib/action_controller/pagination.rb
index f7cd74120e..54084c0361 100644
--- a/actionpack/lib/action_controller/pagination.rb
+++ b/actionpack/lib/action_controller/pagination.rb
@@ -191,7 +191,7 @@ module ActionController
def paginator_and_collection_for(collection_id, options) #:nodoc:
klass = options[:class_name].constantize
- page = @params[options[:parameter]]
+ page = params[options[:parameter]]
count = count_collection_for_pagination(klass, options)
paginator = Paginator.new(self, count, options[:per_page], page)
collection = find_collection_for_pagination(klass, options, paginator)