Merge remote-tracking branch 'origin/master' into 3.0.0-dev

This commit is contained in:
Kevin Chung
2020-06-29 19:35:25 -04:00

View File

@@ -110,7 +110,7 @@ class ThemeLoader(FileSystemLoader):
def get_source(self, environment, template): def get_source(self, environment, template):
# Check if the template has been overriden # Check if the template has been overriden
if template in self.overriden_templates: if template in self.overriden_templates:
return self.overriden_templates[template], template, True return self.overriden_templates[template], template, lambda: True
# Check if the template requested is for the admin panel # Check if the template requested is for the admin panel
if template.startswith("admin/"): if template.startswith("admin/"):