Changeset 676
- Timestamp:
- 09/23/05 16:59:17 (3 years ago)
- Files:
-
- django/trunk/django/views/core/flatfiles.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/views/core/flatfiles.py
r57 r676 1 1 from django.core import template_loader 2 from django.core.exceptions import Http404 3 from django.core.extensions import DjangoContext as Context 2 from django.core.extensions import get_object_or_404, DjangoContext 4 3 from django.models.core import flatfiles 5 4 from django.utils.httpwrappers import HttpResponse … … 19 18 if not url.startswith('/'): 20 19 url = "/" + url 21 try: 22 f = flatfiles.get_object(url__exact=url, sites__id__exact=SITE_ID) 23 except flatfiles.FlatFileDoesNotExist: 24 raise Http404 20 f = get_object_or_404(flatfiles, url__exact=url, sites__id__exact=SITE_ID) 25 21 # If registration is required for accessing this page, and the user isn't 26 22 # logged in, redirect to the login page. … … 29 25 return redirect_to_login(request.path) 30 26 t = template_loader.select_template([f.template_name, 'flatfiles/default']) 31 c = Context(request, {27 c = DjangoContext(request, { 32 28 'flatfile': f, 33 29 })
