summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-02-16 12:50:57 +0000
committerJannis Leidel <jannis@leidel.info>2011-02-16 12:50:57 +0000
commitada08cd6d824e4cee976d3c3b68b0d153b403eee (patch)
tree16997d9ad5c3b5c78261d3d5d54056227b8977c9 /django/conf
parent24e0b56dcb92febdaf9ea83b394d7866c7c956a9 (diff)
Fixed #15314 -- Added tests for the static URL pattern function added in r15530 and made sure the **kwargs are passed to the view correctly. Thanks for the report and initial patch, Bruno ReniƩ.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/urls/static.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/urls/static.py b/django/conf/urls/static.py
index f90b8b5cab..ff1942f990 100644
--- a/django/conf/urls/static.py
+++ b/django/conf/urls/static.py
@@ -22,5 +22,5 @@ def static(prefix, view='django.views.static.serve', **kwargs):
elif '://' in prefix:
raise ImproperlyConfigured("URL '%s' not allowed as static prefix" % prefix)
return patterns('',
- url(r'^%s(?P<path>.*)$' % re.escape(prefix.lstrip('/')), view, **kwargs),
+ url(r'^%s(?P<path>.*)$' % re.escape(prefix.lstrip('/')), view, kwargs=kwargs),
)