diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-08-23 07:06:30 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-08-23 07:06:30 +0000 |
| commit | a0e87b771bc0ee1b1f307099e605ee415f1c9dbd (patch) | |
| tree | 5363813af24c2fd49ff8bae6abf9b30672c82bf5 | |
| parent | 58c579b0056bbc8e50cdc2436929fc9703bfcab5 (diff) | |
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
| -rw-r--r-- | django/contrib/gis/templates/gis/kml/placemarks.kml | 6 |
1 files 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 %} <Placemark> - <name>{{ place.name|escape }}</name> - <description>{{ place.description|escape }}</description> - {{ place.kml }} + <name>{% if place.name %}{{ place.name }}{% else %}{{ place }}{% endif %}</name> + <description>{% if place.description %}{{ place.description }}{% else %}{{ place }}{% endif %}</description> + {{ place.kml|safe }} </Placemark>{% endfor %}{% endblock %} |