From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 27 Jun 2011 14:11:50 +0000 (-0400)
Subject: Merge branch 'develop' into fast_containers
X-Git-Tag: philo-0.9.1^2~5^2~8^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/1b86deeeaf9c98d994e95b983c44a82e004275b0

Merge branch 'develop' into fast_containers

Conflicts:
	philo/templatetags/containers.py
---

1b86deeeaf9c98d994e95b983c44a82e004275b0
diff --cc philo/templatetags/containers.py
index 3370c78,be94a3d..2c55034
--- a/philo/templatetags/containers.py
+++ b/philo/templatetags/containers.py
@@@ -71,21 -47,10 +71,11 @@@ class ContainerNode(template.Node)
  		else:
  			# Otherwise it's a contentlet.
  			try:
 -				contentlet = page.contentlets.get(name__exact=self.name)
 -				content = contentlet.content
 -			except ObjectDoesNotExist:
 +				contentlet = container_context.contentlets[self.name]
 +			except KeyError:
  				content = ''
 +			else:
 +				content = contentlet.content
- 				
- 				if '{%' in content or '{{' in content:
- 					try:
- 						content = template.Template(contentlet.content, name=contentlet.name).render(context)
- 					except template.TemplateSyntaxError, e:
- 						if settings.DEBUG:
- 							content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, e))
- 						else:
- 							content = settings.TEMPLATE_STRING_IF_INVALID
- 			content = mark_safe(content)
  		return content