------------------------------------------------------------
revno: 1045
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Fri 2009-03-13 09:24:11 -0700
message:
  Fixed a bug that would show a list on the admin and listinfo overview
  pages if its web_page_url host contained the current host as a
  substring.  Bug #342162.
modified:
  Mailman/Cgi/admin.py
  Mailman/Cgi/listinfo.py
  NEWS

=== modified file 'Mailman/Cgi/admin.py'
--- Mailman/Cgi/admin.py        2009-01-11 19:34:35 +0000
+++ Mailman/Cgi/admin.py        2009-03-13 16:24:11 +0000
@@ -232,7 +232,7 @@
         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:

=== modified file 'Mailman/Cgi/listinfo.py'
--- Mailman/Cgi/listinfo.py     2005-08-27 01:40:17 +0000
+++ Mailman/Cgi/listinfo.py     2009-03-13 16:24:11 +0000
@@ -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 @@
         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:

=== modified file 'NEWS'
--- NEWS        2009-03-13 01:14:10 +0000
+++ NEWS        2009-03-13 16:24:11 +0000
@@ -1,5 +1,5 @@
 Mailman - The GNU Mailing List Management System
-Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 Here is a history of user visible changes to Mailman.
@@ -37,6 +37,10 @@
 
   Bug fixes and other patches
 
+    - Fixed a bug that would show a list on the admin and listinfo overview
+      pages if its web_page_url host contained the current host as a
+      substring.  Bug #342162.
+
     - Fixed a bug in Utils.canonstr() that would throw a UnicodeDecodeError
       if the string contained an HTML entity > 255 and also characters in the
       128-255 range.  Bug #341594.



--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to