From e7e5fecbe0908ef70196b0a77848ae492d4c01f0 Mon Sep 17 00:00:00 2001
From: Joseph Kocherhans <joseph@jkocherhans.com>
Date: Sat, 29 Mar 2008 19:29:57 +0000
Subject: [PATCH] newforms-admin: Fixed #6921. list_per_page is now accessed
 from the correct object. Thanks, hambaloney.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 AUTHORS                            | 1 +
 django/contrib/admin/views/main.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index a23e4f30a8..58d2918c3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -162,6 +162,7 @@ answer newbie questions, and generally made Django that much better:
     Espen Grindhaug <http://grindhaug.org/>
     Thomas Güttler <hv@tbz-pariv.de>
     dAniel hAhler
+    hambaloney
     Brian Harring <ferringb@gmail.com>
     Brant Harris
     Hawkeye
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index ee71e3cda0..626aeac4e8 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -177,7 +177,7 @@ class ChangeList(object):
         return mark_safe('?' + '&amp;'.join([u'%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20'))
 
     def get_results(self, request):
-        paginator = QuerySetPaginator(self.query_set, self.lookup_opts.admin.list_per_page)
+        paginator = QuerySetPaginator(self.query_set, self.list_per_page)
 
         # Get the number of objects, with admin filters applied.
         try: