diff options
| author | David Planella <david.planella@gmail.com> | 2008-08-02 18:54:30 +0200 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2008-08-02 18:54:30 +0200 |
| commit | 9476341ddf99f5a5138c2dc81c84a797b2c81579 (patch) | |
| tree | 3ce6ca7ed64a1aa7cb2915b22d799b12f0ef6a36 | |
| parent | 53f8c6efb60c7a570b34c39d317a3910e92a4ef1 (diff) | |
| parent | 39b6bc673e4cbcd1c71aefa3b7130960604c4749 (diff) | |
| download | mailman2-9476341ddf99f5a5138c2dc81c84a797b2c81579.tar.gz mailman2-9476341ddf99f5a5138c2dc81c84a797b2c81579.tar.xz mailman2-9476341ddf99f5a5138c2dc81c84a797b2c81579.zip | |
Merged from upstream
| -rw-r--r-- | Mailman/Cgi/admin.py | 15 | ||||
| -rw-r--r-- | Mailman/ListAdmin.py | 4 |
2 files changed, 7 insertions, 12 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index d1a255d3..a6251058 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,7 +28,6 @@ import sha import urllib import signal from types import * -from string import lowercase, digits from email.Utils import unquote, parseaddr, formataddr @@ -901,12 +900,10 @@ def membership_options(mlist, subcat, cgidata, doc, form): qsenviron = os.environ.get('QUERY_STRING') if qsenviron: qs = cgi.parse_qs(qsenviron) - bucket = qs.get('letter', 'a')[0].lower() - if bucket not in digits + lowercase: - bucket = None + bucket = qs.get('letter', '0')[0].lower() + keys = buckets.keys() + keys.sort() if not bucket or not buckets.has_key(bucket): - keys = buckets.keys() - keys.sort() bucket = keys[0] members = buckets[bucket] action = adminurl + '/members?letter=%s' % bucket @@ -942,9 +939,7 @@ def membership_options(mlist, subcat, cgidata, doc, form): # Add the alphabetical links if bucket: cells = [] - for letter in digits + lowercase: - if not buckets.get(letter): - continue + for letter in keys: url = adminurl + '/members?letter=%s' % letter if letter == bucket: show = Bold('[%s]' % letter.upper()).Format() diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py index ba486e09..191b76f8 100644 --- a/Mailman/ListAdmin.py +++ b/Mailman/ListAdmin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2004 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -499,7 +499,7 @@ class ListAdmin: subject = _('Request to mailing list %(realname)s rejected') finally: i18n.set_translation(otrans) - msg = Message.UserNotification(recip, self.GetBouncesEmail(), + msg = Message.UserNotification(recip, self.GetOwnerEmail(), subject, text, lang) msg.send(self) |