diff options
| -rw-r--r-- | django/template/loader_tags.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 8f951edee9..b642765341 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -88,8 +88,9 @@ class ExtendsNode(Node): def get_parent(self, context): if self.parent_name_expr: - self.parent_name = self.parent_name_expr.resolve(context) - parent = self.parent_name + parent = self.parent_name_expr.resolve(context) + else: + parent = self.parent_name if not parent: error_msg = "Invalid template name in 'extends' tag: %r." % parent if self.parent_name_expr: |