summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/shortcuts/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/shortcuts/__init__.py b/django/shortcuts/__init__.py
index 00e97b1107..b7d69b5b0c 100644
--- a/django/shortcuts/__init__.py
+++ b/django/shortcuts/__init__.py
@@ -25,7 +25,10 @@ def render(request, *args, **kwargs):
django.template.loader.render_to_string() with the passed arguments.
Uses a RequestContext by default.
"""
- httpresponse_kwargs = {'mimetype': kwargs.pop('mimetype', None)}
+ httpresponse_kwargs = {
+ 'content_type': kwargs.pop('content_type', None),
+ 'status': kwargs.pop('status', None),
+ }
kwargs['context_instance'] = kwargs.get('context_instance', RequestContext(request))
return HttpResponse(loader.render_to_string(*args, **kwargs),
**httpresponse_kwargs)