diff options
| author | Rob Hudson | 2010-09-07 15:42:18 -0700 |
|---|---|---|
| committer | Rob Hudson | 2010-09-07 15:42:18 -0700 |
| commit | 0a62cc02b621a08d2a5d19261ef64e31a5065214 (patch) | |
| tree | 6ac42209b0cf87adf0be59d9253612c4f5d29049 | |
| parent | d6911f737070f46984befe621878fcf7f1b6176e (diff) | |
| download | django-debug-toolbar-0a62cc02b621a08d2a5d19261ef64e31a5065214.tar.bz2 | |
Fixed template block inheritance bug (issues 77 and 97)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | debug_toolbar/panels/template.py | 13 |
2 files changed, 12 insertions, 3 deletions
@@ -4,6 +4,8 @@ News for django-debug-toolbar develop ------- +* Fixed template block inheritance bug (issues 77 and 97). + * Fixed flash of unstyled toolbar. * Updated to work with old TEMPLATE_LOADERS settings from < 1.2. 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>'): |