diff options
| author | cotton | 1998-11-09 16:44:21 +0000 |
|---|---|---|
| committer | cotton | 1998-11-09 16:44:21 +0000 |
| commit | 679170d60ea35d8dd2797d0003a3ef7f5dcd5b67 (patch) | |
| tree | 480dcdca1f06364b5abd27ba6a98ad3022f65974 | |
| parent | cc723a8b63ed04e98992db0bd4df4fc9a2769c7e (diff) | |
| download | mailman-679170d60ea35d8dd2797d0003a3ef7f5dcd5b67.tar.gz mailman-679170d60ea35d8dd2797d0003a3ef7f5dcd5b67.tar.zst mailman-679170d60ea35d8dd2797d0003a3ef7f5dcd5b67.zip | |
changed urls's to us %s/%s instead of os.path.join:
changed GetAbsoluteScriptURL
changed options for admin/archives (line 442)
scott
| -rw-r--r-- | Mailman/MailList.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index ed1e9fed0..60a9dd240 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -93,13 +93,14 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, def GetRelativeScriptURL(self, script_name): prefix = '../'*Utils.GetNestingLevel() return '%s%s/%s' % (prefix,script_name, self._internal_name) + def GetAbsoluteScriptURL(self, script_name): if self.web_page_url: prefix = self.web_page_url else: prefix = mm_cfg.DEFAULT_URL - return os.path.join(prefix, '%s/%s' % (script_name, - self._internal_name)) + return "%s/%s/%s" % (prefix, script_name, self._internal_name) + def GetAbsoluteOptionsURL(self, addr, obscured=0,): options = self.GetAbsoluteScriptURL('options') @@ -107,7 +108,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, treated = Utils.ObscureEmail(addr, for_text=0) else: treated = addr - return os.path.join(options, treated) + return "%s/%s" % (options, treated) def GetUserOption(self, user, option): if option == mm_cfg.Digests: @@ -437,9 +438,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, config_info['privacy'] = [ "List access policies, including anti-spam measures," " covering members and outsiders." - ' (See also the <a href="%s">Archival Options section</a> for' - ' separate archive-privacy settings.)' - % os.path.join(self.GetRelativeScriptURL('admin'), 'archive'), + ' (See also the <a href="%s/archive">Archival Options section</a> for' + ' separate archive-privacy settings.)' % (self.GetRelativeScriptURL('admin')), "Subscribing", |