From f98342ca958b72a961a15240486952cb0b637709 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Wed, 23 Jun 2010 21:09:34 -0700 Subject: Fixed a bug which would fail to show a list on the admin and listinfo overview pages if its web_page_url contained a :port. Bug # 597741. --- Mailman/Cgi/admin.py | 5 +++-- Mailman/Cgi/listinfo.py | 5 +++-- NEWS | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index ef5ea1ac..47ec59c2 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -233,8 +233,9 @@ def admin_overview(msg=''): for name in listnames: mlist = MailList.MailList(name, lock=0) if mlist.advertised: - if mm_cfg.VIRTUAL_HOST_OVERVIEW and \ - mlist.web_page_url.find('/%s/' % hostname) == -1: + if mm_cfg.VIRTUAL_HOST_OVERVIEW and ( + mlist.web_page_url.find('/%s/' % hostname) == -1 and + 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 3a9b52cd..22ab9d5f 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -89,8 +89,9 @@ def listinfo_overview(msg=''): for name in listnames: mlist = MailList.MailList(name, lock=0) if mlist.advertised: - if mm_cfg.VIRTUAL_HOST_OVERVIEW and \ - mlist.web_page_url.find('/%s/' % hostname) == -1: + if mm_cfg.VIRTUAL_HOST_OVERVIEW and ( + mlist.web_page_url.find('/%s/' % hostname) == -1 and + mlist.web_page_url.find('/%s:' % hostname) == -1): # List is for different identity of this host - skip it. continue else: diff --git a/NEWS b/NEWS index 38ad8571..453413ec 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,9 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Fixed a bug which would fail to show a list on the admin and listinfo + overview pages if its web_page_url contained a :port. Bug # 597741. + - Fixed bin/genaliases to not throw TypeError when MTA = None. Bug #587657. -- cgit v1.2.3