merge-requests/8/head
Bob Mottram 2020-12-09 12:38:58 +00:00
parent 3a7074cebf
commit 8ad67ad425
2 changed files with 3 additions and 8 deletions

View File

@ -4569,10 +4569,11 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.themeName: if not self.server.themeName:
self.themeName = getConfigParam(baseDir, 'theme') self.themeName = getConfigParam(baseDir, 'theme')
if not self.server.themeName: if not self.server.themeName:
themeName = 'default' self.server.themeName = 'default'
# custom favicon # custom favicon
faviconFilename = \ faviconFilename = \
baseDir + '/theme/' + self.server.themeName + '/icons/' + favFilename baseDir + '/theme/' + self.server.themeName + \
'/icons/' + favFilename
if not os.path.isfile(faviconFilename): if not os.path.isfile(faviconFilename):
# default favicon # default favicon
faviconFilename = \ faviconFilename = \

View File

@ -394,12 +394,6 @@ def getIconsWebPath(baseDir: str) -> str:
"""Returns the web path where icons exist """Returns the web path where icons exist
""" """
return 'icons' return 'icons'
# iconsPath = 'icons'
# theme = getConfigParam(baseDir, 'theme')
# if theme:
# if os.path.isdir(baseDir + '/theme/' + theme + '/icons'):
# iconsPath = 'icons/' + theme
# return iconsPath
def scheduledPostsExist(baseDir: str, nickname: str, domain: str) -> bool: def scheduledPostsExist(baseDir: str, nickname: str, domain: str) -> bool: