From a0e87b771bc0ee1b1f307099e605ee415f1c9dbd Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Sat, 23 Aug 2008 07:06:30 +0000 Subject: [PATCH] Fixed #8465. Mark KML input as safe so elements aren't escaped; added some defaults for name and description. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8480 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/templates/gis/kml/placemarks.kml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/django/contrib/gis/templates/gis/kml/placemarks.kml b/django/contrib/gis/templates/gis/kml/placemarks.kml index 2b9b5e2f02..ea2ac191e5 100644 --- a/django/contrib/gis/templates/gis/kml/placemarks.kml +++ b/django/contrib/gis/templates/gis/kml/placemarks.kml @@ -1,8 +1,8 @@ {% extends "gis/kml/base.kml" %} {% block placemarks %}{% for place in places %} - {{ place.name|escape }} - {{ place.description|escape }} - {{ place.kml }} + {% if place.name %}{{ place.name }}{% else %}{{ place }}{% endif %} + {% if place.description %}{{ place.description }}{% else %}{{ place }}{% endif %} + {{ place.kml|safe }} {% endfor %}{% endblock %}