From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Sun, 26 Jun 2011 18:29:28 +0000 (-0400)
Subject: Removed automatic interpretation of contentlets as templates as per issue #168.
X-Git-Tag: philo-0.9.1^2~5^2~9
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/34a9cd2a670e84771d1d54e6fd6af87bcb1c279c

Removed automatic interpretation of contentlets as templates as per issue #168.
---

diff --git a/philo/templatetags/containers.py b/philo/templatetags/containers.py
index bc04b9f..be94a3d 100644
--- a/philo/templatetags/containers.py
+++ b/philo/templatetags/containers.py
@@ -48,19 +48,9 @@ class ContainerNode(template.Node):
 			# Otherwise it's a contentlet.
 			try:
 				contentlet = page.contentlets.get(name__exact=self.name)
-				if '{%' in contentlet.content or '{{' in contentlet.content:
-					try:
-						content = template.Template(contentlet.content, name=contentlet.name).render(context)
-					except template.TemplateSyntaxError, error:
-						if settings.DEBUG:
-							content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, error))
-						else:
-							content = settings.TEMPLATE_STRING_IF_INVALID
-				else:
-					content = contentlet.content
+				content = contentlet.content
 			except ObjectDoesNotExist:
-				content = settings.TEMPLATE_STRING_IF_INVALID
-			content = mark_safe(content)
+				content = ''
 		return content