Merge commit 'paltman/master'

compress/templatetags/compressed.py

@@ -14,10 +14,11 @@ def render_common(template_name, obj, filename, version):
         filename = get_output_filename(filename, version)
 
     context = obj.get('extra_context', {})
+    prefix = context.get('prefix', None)
     if filename.startswith('http://'):
         context['url'] = filename
     else:
-        context['url'] = media_url(filename)
+        context['url'] = media_url(filename, prefix)
         
     return template.loader.render_to_string(template_name, context)
 

compress/utils.py

@@ -60,7 +60,9 @@ def media_root(filename):
     """
     return os.path.join(django_settings.MEDIA_ROOT, filename)
 
-def media_url(url):
+def media_url(url, prefix=None):
+    if prefix:
+        return prefix + urlquote(url)
     return django_settings.MEDIA_URL + urlquote(url)
 
 def concat(filenames, separator=''):