Commit 2e05c0da by John Jarvis

Merge pull request #1591 from edx/jarv/theme-name

setting THEME_NAME to None when it's set to an empty string
parents 93dddf8d f7850811
...@@ -163,6 +163,11 @@ BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE ...@@ -163,6 +163,11 @@ BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
# Theme overrides # Theme overrides
THEME_NAME = ENV_TOKENS.get('THEME_NAME', None) THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
# Workaround for setting THEME_NAME to an empty
# string which is the default due to this ansible
# bug: https://github.com/ansible/ansible/issues/4812
if THEME_NAME == "":
THEME_NAME = None
if not THEME_NAME is None: if not THEME_NAME is None:
enable_theme(THEME_NAME) enable_theme(THEME_NAME)
FAVICON_PATH = 'themes/%s/images/favicon.ico' % THEME_NAME FAVICON_PATH = 'themes/%s/images/favicon.ico' % THEME_NAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment