Merge branch 'master' of http://github.com/robhudson/django-debug-toolbar

1 files changed, 10 insertions, 3 deletions

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index fe34729..d9cd071 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -19,9 +19,16 @@ from debug_toolbar.panels import DebugPanel
 # e-mail interception, which we don't want
 from django.test.utils import instrumented_test_render
 from django.template import Template
-if Template.render != instrumented_test_render:
-    Template.original_render = Template.render
-    Template.render = instrumented_test_render
+
+if not hasattr(Template, '_render'): # Django < 1.2
+    if Template.render != instrumented_test_render:
+        Template.original_render = Template.render
+        Template.render = instrumented_test_render
+else:
+    if Template._render != instrumented_test_render:
+        Template.original_render = Template._render
+        Template._render = instrumented_test_render
+
 # MONSTER monkey-patch
 old_template_init = Template.__init__
 def new_template_init(self, template_string, origin=None, name='<Unknown Template>'):