From 4fa764e301ff6536bc267406ed4fc237fb61f7aa Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Wed, 6 Jan 2016 20:58:17 +0000
Subject: [PATCH] Renamed MEDIA_URL to prevent overriding django setting
 https://docs.djangoproject.com/en/1.9/ref/settings/#media-url

---
 alliance_auth/settings.py.example | 2 +-
 stock/templates/public/index.html | 4 ++--
 util/context_processors.py        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index dde3385c..8eb5e13e 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -196,7 +196,7 @@ EMAIL_USE_TLS = 'True' == os.environ.get('AA_EMAIL_USE_TLS', 'True')
 # FORUM_URL - URL for your forums. Blank to hide link
 ####################
 KILLBOARD_URL = os.environ.get('AA_KILLBOARD_URL', '')
-MEDIA_URL = os.environ.get('AA_MEDIA_URL', '')
+EXTERNAL_MEDIA_URL = os.environ.get('AA_EXTERNAL_MEDIA_URL', '')
 FORUM_URL = os.environ.get('AA_FORUM_URL', '')
 
 #########################
diff --git a/stock/templates/public/index.html b/stock/templates/public/index.html
index 039b7523..f0e8d755 100644
--- a/stock/templates/public/index.html
+++ b/stock/templates/public/index.html
@@ -66,9 +66,9 @@
             </a>
         </p>
     {% endif %}
-    {% if MEDIA_URL %}
+    {% if EXTERNAL_MEDIA_URL %}
         <p style="text-align:center">
-            <a href="{{MEDIA_URL}}">
+            <a href="{{EXTERNAL_MEDIA_URL}}">
                 <img src="{% static 'img/index_images/media.png' %}" border="0">
             </a>
         </p>
diff --git a/util/context_processors.py b/util/context_processors.py
index 2d8444a3..9367da57 100755
--- a/util/context_processors.py
+++ b/util/context_processors.py
@@ -45,5 +45,5 @@ def domain_url(request):
             'JACK_KNIFE_URL': settings.JACK_KNIFE_URL,
             'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID,
             'KILLBOARD_URL': settings.KILLBOARD_URL,
-            'MEDIA_URL': settings.MEDIA_URL,
+            'EXTERNAL_MEDIA_URL': settings.EXTERNAL_MEDIA_URL,
             'CURRENT_UTC_TIME': timezone.now()}