Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
6fd98138
Commit
6fd98138
authored
Nov 25, 2015
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3672 from linovia/feature/multitemplate
Make DRF compatible with multi template engine in Django 1.8
parents
ff0eeaf7
d6c32662
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
rest_framework/compat.py
+1
-1
No files found.
rest_framework/compat.py
View file @
6fd98138
...
...
@@ -221,7 +221,7 @@ def template_render(template, context=None, request=None):
:param request: Request instance
:return: rendered template as SafeText instance
"""
if
django
.
VERSION
<
(
1
,
9
)
or
isinstance
(
template
,
Template
):
if
django
.
VERSION
<
(
1
,
8
)
or
isinstance
(
template
,
Template
):
if
request
:
context
=
RequestContext
(
request
,
context
)
else
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment