5 files changed, 8 insertions, 5 deletions

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 4cd92a6fc..a8597a61b 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -494,8 +494,8 @@ def FormatMembershipOptions(lst):
     for member in lst.digest_members:
         digests[member] = 1
     all = lst.members + lst.digest_members
-    if len(all) > mm_cfg.ADMIN_MEMBER_CHUNKSIZE:
-        chunks = Utils.chunkify(all)
+    if len(all) > lst.admin_member_chunksize:
+        chunks = Utils.chunkify(all, lst.admin_member_chunksize)
         if not cgi_data.has_key("chunk"):
             chunk = 0
         else:
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 3c22d7712..517ae6bdc 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -213,7 +213,7 @@ PENDING_REQUEST_LIFE = 60 * 60 * 24 * 3 # 3 days
 
 # how many members to display at a time on the admin cgi to unsubscribe
 # them or change their options.
-ADMIN_MEMBER_CHUNKSIZE = 30
+DEFAULT_ADMIN_MEMBER_CHUNKSIZE = 30
 
 
 # These directories are used to find various important files in the Mailman
@@ -271,4 +271,4 @@ PRIVATE_ARCHIVE_FILE_DIR	= os.path.join(PREFIX, 'archives/private')
 VERSION           = '@VERSION@'
 
 # Data file version number
-DATA_FILE_VERSION = 8
+DATA_FILE_VERSION = 9
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 1bd8b3be7..652760504 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -197,6 +197,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
 	self.obscure_addresses = mm_cfg.DEFAULT_OBSCURE_ADDRESSES
 	self.member_posting_only = mm_cfg.DEFAULT_MEMBER_POSTING_ONLY
 	self.host_name = mm_cfg.DEFAULT_HOST_NAME
+        self.admin_member_chunksize = mm_cfg.DEFAULT_ADMIN_MEMBER_CHUNKSIZE
 
 	# Analogs to these are initted in Digester.InitVars
 	self.nondigestable = mm_cfg.DEFAULT_NONDIGESTABLE
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index b78731314..0beb43478 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -406,7 +406,7 @@ def map_maillists(func, names=None, unlock=None, verbose=0):
     return got
 
 
-def chunkify(members, chunksize=mm_cfg.ADMIN_MEMBER_CHUNKSIZE):
+def chunkify(members, chunksize=mm_cfg.DEFAULT_ADMIN_MEMBER_CHUNKSIZE):
      """
      return a list of lists of members
      """
diff --git a/Mailman/versions.py b/Mailman/versions.py
index 02bf2d7ac..e3f2df273 100644
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -83,6 +83,8 @@ def UpdateOldVars(l, stored_state):
         delattr(l, "open_subscribe")
     if not hasattr(l, "administrivia"):
         setattr(l, "administrivia", mm_cfg.DEFAULT_ADMINISTRIVIA)
+    if not hasattr(l, "admin_member_chunksize"):
+        setattr(l, "admin_member_chunksize", mm_cfg.DEFAULT_ADMIN_MEMBER_CHUNKSIZE)
     if not hasattr(l, "posters_includes_members"):
         setattr(l, "posters_includes_members",
                 mm_cfg.DEFAULT_POSTERS_INCLUDES_MEMBERS)