From 37260e046f438e4eb871b6b84cafbf4fcd4b92ea Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 9 Jan 2009 12:42:35 +0000 Subject: [1.0.X] Revised r9567 slightly to be backwards compatible with versions 1.0 - 1.0.2. Also documented the change. We prefer to load directory_index.html for static directory listings, but if you have the (older style) "directory_index" template and no .html version, we'll load that. This should stop a bunch of mysterious breakages when people upgrade to Django 1.0.3 or Django 1.1. Also keeps the docs in sync with released code. Fixed #9993. Backport of r9725 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9726 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/views/static.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/views/static.py b/django/views/static.py index c8ebf0c22d..8355950fe0 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -91,7 +91,8 @@ DEFAULT_DIRECTORY_INDEX_TEMPLATE = """ def directory_index(path, fullpath): try: - t = loader.get_template('static/directory_index.html') + t = loader.select_template(['static/directory_index.html', + 'static/directory_index']) except TemplateDoesNotExist: t = Template(DEFAULT_DIRECTORY_INDEX_TEMPLATE, name='Default directory index template') files = [] -- cgit v1.3