diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-02-12 00:22:22 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-02-12 00:22:22 +0000 |
| commit | a0c354ee4ed02bb3f958dfb029d29b76e6637952 (patch) | |
| tree | b91d1196ab7675efca2a3201258d1c9644f722e0 /django | |
| parent | d123588184dfecc286e8e06e16dc0383f435c051 (diff) | |
Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure
correct nesting. Thanks for the patch, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/loader_tags.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index e329b1bb36..0e11b12c21 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -129,7 +129,7 @@ def do_block(parser, token): parser.__loaded_blocks.append(block_name) except AttributeError: # parser.__loaded_blocks isn't a list yet parser.__loaded_blocks = [block_name] - nodelist = parser.parse(('endblock',)) + nodelist = parser.parse(('endblock','endblock %s' % block_name)) parser.delete_first_token() return BlockNode(block_name, nodelist) |