small bug fixes and allowed media url to start with http

3 files changed, 6 insertions, 3 deletions

diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
index ad7bffa1..9a78d8a0 100644
--- a/askbot/skins/default/templates/meta/bottom_scripts.html
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -76,7 +76,7 @@
 </script>
 {% if settings.USE_CUSTOM_JS %}
 <script 
-    src="{% url "custom_js"%}?{{ settings.MEDIA_RESOURCE_REVISION }}"
+    src="{% url "custom_js"%}?v={{ settings.MEDIA_RESOURCE_REVISION }}"
     type="text/javascript"
 ></script>
 {% endif %}
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 72e93d9a..05426898 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -214,10 +214,12 @@ def test_celery():
 def test_media_url():
     """makes sure that setting `MEDIA_URL`
     has leading slash"""
-    if not django_settings.MEDIA_URL.startswith('/'):
+    media_url = django_settings.MEDIA_URL
+    #todo: add proper url validation to MEDIA_URL setting
+    if not (media_url.startswith('/') or media_url.startswith('http')):
         raise ImproperlyConfigured(PREAMBLE + \
             "\nMEDIA_URL parameter must be a unique url on the site\n"
-            "and must start with a slash - e.g. /media/"
+            "and must start with a slash - e.g. /media/ or http(s)://"
         )
 
 class SettingsTester(object):
diff --git a/askbot/views/meta.py b/askbot/views/meta.py
index 3ad32b9b..6415077a 100644
--- a/askbot/views/meta.py
+++ b/askbot/views/meta.py
@@ -29,6 +29,7 @@ def config_variable(request, variable_name = None, mimetype = None):
     """Print value from the configuration settings
     as response content. All parameters are required.
     """
+    #todo add http header-based caching here!!!
     output = getattr(askbot_settings, variable_name, '')
     return HttpResponse(output, mimetype = mimetype)