From 1f3b0e73425db606d1072551fe6ff4d0ceed368d Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Sun, 21 Apr 2002 15:27:02 +0000
Subject: GetStandardReplacements(), MailmanLogo(), IMAGE_LOGOS, SHORTCUT_ICON:
 Clarify the semantics of all these settings.  Setting IMAGE_LOGOS to 0 is the
 only way to suppress the sponsor images, but this also suppresses the
 favicon.  You should now never set SHORTCUT_ICON to 0 (it should always be
 the string naming the favicon file).

Closes SF bugs # 546421 and 546418.
---
 Mailman/HTMLFormatter.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Mailman/HTMLFormatter.py')

diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index 1beb73aaa..e297a92c9 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -363,8 +363,7 @@ class HTMLFormatter:
             listlangs = Utils.GetLanguageDescr(self.preferred_language)
         else:
             listlangs = self.GetLangSelectBox(lang).Format()
-        return { 
-            '<mm-favicon>' : mm_cfg.IMAGE_LOGOS + mm_cfg.SHORTCUT_ICON,
+        d = { 
             '<mm-mailman-footer>' : self.GetMailmanFooter(),
             '<mm-list-name>' : self.real_name,
             '<mm-email-user>' : self._internal_name,
@@ -387,6 +386,9 @@ class HTMLFormatter:
             '<mm-host>' : self.host_name,
             '<mm-list-langs>' : listlangs,
             }
+        if mm_cfg.IMAGE_LOGOS:
+            d['<mm-favicon>'] = mm_cfg.IMAGE_LOGOS + mm_cfg.SHORTCUT_ICON
+        return d
 
     def GetAllReplacements(self, lang=None):
         """
-- 
cgit v1.2.3-70-g09d2