diff options
| author | Mark Sapiro <mark@msapiro.net> | 2009-07-31 15:37:29 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2009-07-31 15:37:29 -0700 |
| commit | f2396437f76d97fefedb55179390851c4fd05592 (patch) | |
| tree | 3e30e9be19ef4cabb21b9bf08d541b82e70c7269 /Mailman/Cgi | |
| parent | 0f74db6fb0ae5a4fcdfaaf1976d196efc01ab0b0 (diff) | |
| download | mailman2-f2396437f76d97fefedb55179390851c4fd05592.tar.gz mailman2-f2396437f76d97fefedb55179390851c4fd05592.tar.xz mailman2-f2396437f76d97fefedb55179390851c4fd05592.zip | |
Backported several bug fixes from the 2.2 branch.
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/admin.py | 2 | ||||
| -rw-r--r-- | Mailman/Cgi/listinfo.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 3d790b2e..33aec336 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -232,7 +232,7 @@ def admin_overview(msg=''): mlist = MailList.MailList(name, lock=0) if mlist.advertised: if mm_cfg.VIRTUAL_HOST_OVERVIEW and \ - mlist.web_page_url.find(hostname) == -1: + mlist.web_page_url.find('/%s/' % hostname) == -1: # List is for different identity of this host - skip it. continue else: diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py index abbf570b..5b965909 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2009 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 @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Produce listinfo page, primary web entry-point to mailing lists. """ @@ -87,7 +88,7 @@ def listinfo_overview(msg=''): mlist = MailList.MailList(name, lock=0) if mlist.advertised: if mm_cfg.VIRTUAL_HOST_OVERVIEW and \ - mlist.web_page_url.find(hostname) == -1: + mlist.web_page_url.find('/%s/' % hostname) == -1: # List is for different identity of this host - skip it. continue else: |