Commit 5ed621c8 by Joshua Kehn Committed by Timothée Peignier

Fix for urls containing autoescaped characters

References issue #282.

I added an import for `mark_safe` and wrapped the JavaScript / CSS
urls in it. All tests passed.
parent e0ff4d47
...@@ -63,3 +63,4 @@ or just made Pipeline more awesome. ...@@ -63,3 +63,4 @@ or just made Pipeline more awesome.
* Venelin Stoykov <venelin@magicsolutions.bg> * Venelin Stoykov <venelin@magicsolutions.bg>
* Victor Shnayder <victor@mitx.mit.edu> * Victor Shnayder <victor@mitx.mit.edu>
* Zenobius Jiricek <zenobius.jiricek@gmail.com> * Zenobius Jiricek <zenobius.jiricek@gmail.com>
* Joshua Kehn <josh@kehn.us>
\ No newline at end of file
...@@ -4,6 +4,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage ...@@ -4,6 +4,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage
from django import template from django import template
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.utils.safestring import mark_safe
from pipeline.conf import settings from pipeline.conf import settings
from pipeline.packager import Packager, PackageNotFound from pipeline.packager import Packager, PackageNotFound
...@@ -58,7 +59,7 @@ class CompressedCSSNode(CompressedMixin, template.Node): ...@@ -58,7 +59,7 @@ class CompressedCSSNode(CompressedMixin, template.Node):
context = package.extra_context context = package.extra_context
context.update({ context.update({
'type': guess_type(path, 'text/css'), 'type': guess_type(path, 'text/css'),
'url': staticfiles_storage.url(path) 'url': mark_safe(staticfiles_storage.url(path))
}) })
return render_to_string(template_name, context) return render_to_string(template_name, context)
...@@ -84,7 +85,7 @@ class CompressedJSNode(CompressedMixin, template.Node): ...@@ -84,7 +85,7 @@ class CompressedJSNode(CompressedMixin, template.Node):
context = package.extra_context context = package.extra_context
context.update({ context.update({
'type': guess_type(path, 'text/javascript'), 'type': guess_type(path, 'text/javascript'),
'url': staticfiles_storage.url(path) 'url': mark_safe(staticfiles_storage.url(path))
}) })
return render_to_string(template_name, context) return render_to_string(template_name, context)
......
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