From 29d3cb72d796985fbf52a4511e186e1bd04b12cb Mon Sep 17 00:00:00 2001 From: CodeKevin Date: Mon, 23 May 2016 20:38:21 -0400 Subject: [PATCH] Prioritize user config --- CTFd/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CTFd/utils.py b/CTFd/utils.py index 7c5cc8ed..a38f7345 100644 --- a/CTFd/utils.py +++ b/CTFd/utils.py @@ -320,8 +320,8 @@ def get_smtp(host, port, username=None, password=None, TLS=None, SSL=None): def sendmail(addr, text): if mailserver(): ctf_name = get_config('ctf_name') - mg_api_key = app.config.get('MAILGUN_API_KEY') or get_config('mg_api_key') - mg_base_url = app.config.get('MAILGUN_BASE_URL') or get_config('mg_base_url') + mg_api_key = get_config('mg_api_key') or app.config.get('MAILGUN_API_KEY') + mg_base_url = get_config('mg_base_url') or app.config.get('MAILGUN_BASE_URL') r = requests.post( mg_base_url + '/messages', auth=("api", mg_api_key),