aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2010-06-23 21:09:34 -0700
committerMark Sapiro <mark@msapiro.net>2010-06-23 21:09:34 -0700
commitf98342ca958b72a961a15240486952cb0b637709 (patch)
treea027da23e733ee096efedb2dd9ee111ba2de857c /Mailman
parentf2116f6868195136488ffae43025b42e18e0c484 (diff)
downloadmailman2-f98342ca958b72a961a15240486952cb0b637709.tar.gz
mailman2-f98342ca958b72a961a15240486952cb0b637709.tar.xz
mailman2-f98342ca958b72a961a15240486952cb0b637709.zip
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.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Cgi/admin.py5
-rw-r--r--Mailman/Cgi/listinfo.py5
2 files changed, 6 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: