diff options
| author | msapiro <> | 2006-03-12 17:56:29 +0000 |
|---|---|---|
| committer | msapiro <> | 2006-03-12 17:56:29 +0000 |
| commit | 34eb1a98065125a35fe4e7d37a16404ffa8a4467 (patch) | |
| tree | b55aeb2e6367e516eadd3273710626c53ddde9ab | |
| parent | c40a61bae1d5ab9e83ad1add2c90cbc3a6a81a4c (diff) | |
| download | mailman2-34eb1a98065125a35fe4e7d37a16404ffa8a4467.tar.gz mailman2-34eb1a98065125a35fe4e7d37a16404ffa8a4467.tar.xz mailman2-34eb1a98065125a35fe4e7d37a16404ffa8a4467.zip | |
Fixed long standing bug (1275856) - get_domain() returned DEFAULT_EMAIL_HOST
instead of DEFAULT_URL_HOST is VIRTUAL_HOST_OVERVIEW was off.
| -rw-r--r-- | Mailman/Utils.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 3092db41..872eb072 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2006 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. """Miscellaneous essential routines. @@ -681,7 +682,11 @@ def get_domain(): else: # See the note in Defaults.py concerning DEFAULT_HOST_NAME # vs. DEFAULT_EMAIL_HOST. - hostname = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_EMAIL_HOST + # MAS: This is inconsistent - DEFAULT_URL_HOST is correct. + # DEFAULT_HOST_NAME should really be the host portion of + # DEFAULT_URL, but that's not a setting, and these have been + # deprecated since Aug., 2001, so leave it. + hostname = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_URL_HOST return hostname.lower() |