From 2721743adec561a1662c405028830e53d78a30be Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 3 Nov 2020 11:23:09 +0000 Subject: [PATCH] More generic --- webinterface.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/webinterface.py b/webinterface.py index f4a94a72c..9509450b0 100644 --- a/webinterface.py +++ b/webinterface.py @@ -8725,17 +8725,17 @@ def htmlSearch(cssCache: {}, translate: {}, theme = '' else: theme = '_' + theme - bannerExtensions = ('png', 'jpg', 'jpeg', 'gif', 'avif', 'webp') - for ext in bannerExtensions: - searchBannerFile = 'search_banner.' + ext + themeSearchImageFile, themeSearchBannerFilename = \ + getImageFile(baseDir, 'search_banner', baseDir + '/img', + searchNickname, domain) + if os.path.isfile(themeSearchBannerFilename): searchBannerFilename = \ baseDir + '/accounts/' + \ - searchNickname + '@' + domain + '/' + searchBannerFile - themeSearchBannerFilename = \ - baseDir + '/img/search_banner' + theme + '.' + ext - if os.path.isfile(themeSearchBannerFilename): - copyfile(themeSearchBannerFilename, searchBannerFilename) - break + searchNickname + '@' + domain + '/' + themeSearchImageFile + copyfile(themeSearchBannerFilename, + searchBannerFilename) + searchBannerFile = themeSearchImageFile + if os.path.isfile(searchBannerFilename): usersPath = '/users/' + searchNickname followStr += \