mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Merge pull request #3672 from linovia/feature/multitemplate
Make DRF compatible with multi template engine in Django 1.8
This commit is contained in:
		
						commit
						6fd9813882
					
				| 
						 | 
					@ -221,7 +221,7 @@ def template_render(template, context=None, request=None):
 | 
				
			||||||
    :param request: Request instance
 | 
					    :param request: Request instance
 | 
				
			||||||
    :return: rendered template as SafeText 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:
 | 
					        if request:
 | 
				
			||||||
            context = RequestContext(request, context)
 | 
					            context = RequestContext(request, context)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user