Navigation

views.py

Timestamp:

11/29/07 23:50:44 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged trunk revision [6671].

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6670 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6671

r4265	r6776
5	5	from django.conf import settings
6	6	from django.core.xheaders import populate_xheaders
	7	from django.utils.safestring import mark_safe
7	8
8	9	DEFAULT_TEMPLATE = 'flatpages/default.html'
…	…
31	32	else:
32	33	t = loader.get_template(DEFAULT_TEMPLATE)
	34
	35	# To avoid having to always use the "\|safe" filter in flatpage templates,
	36	# mark the title and content as already safe (since they are raw HTML
	37	# content in the first place).
	38	f.title = mark_safe(f.title)
	39	f.content = mark_safe(f.content)
	40
33	41	c = RequestContext(request, {
34	42	'flatpage': f,