X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3f907fc7dc24bf23960a76dcb0f942401c966d50..9378da0590e3fcb8817d0c0309413bf59083ae8b:/contrib/shipherd/templatetags/shipherd.py

diff --git a/contrib/shipherd/templatetags/shipherd.py b/contrib/shipherd/templatetags/shipherd.py
index 9a4d74c..e3019e1 100644
--- a/contrib/shipherd/templatetags/shipherd.py
+++ b/contrib/shipherd/templatetags/shipherd.py
@@ -1,8 +1,9 @@
-from django import template
+from django import template, VERSION as django_version
 from django.conf import settings
 from django.utils.safestring import mark_safe
 from philo.contrib.shipherd.models import Navigation
 from philo.models import Node
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 
 
@@ -63,7 +64,7 @@ class LazyNavigationRecurser(object):
 			for node in self.template_nodes:
 				bits.append(node.render(context))
 		context.pop()
-		return ''.join(bits)
+		return mark_safe(''.join(bits))
 
 
 class RecurseNavigationNode(template.Node):
@@ -166,6 +167,4 @@ def navigation_host(node, key):
 	try:
 		return Navigation.objects.filter(node__in=node.get_ancestors(include_self=True), key=key).order_by('-node__level')[0].node
 	except:
-		if settings.TEMPLATE_DEBUG:
-			raise
 		return node
\ No newline at end of file