Merge branch 'master' into bio_field_on_userprofile

Luan
2 parents 190e7c6a 2762b25f
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
src/super_archives/templates/message-preview.html
@@ -28,9 +28,9 @@
     {% highlight result.description with query max_length "150" %}
   {% else %}
     {% if result.latest_description %}
-      {{ result.latest_description|escape|truncatechars:150 }}
+      {{ result.latest_description|striptags|escape|truncatechars:150 }}
     {% elif result.description %}
-      {{ result.description|escape|truncatechars:150 }}
+      {{ result.description|striptags|escape|truncatechars:150 }}
     {% endif %}
   {% endif %}
   </span>
	@@ -28,9 +28,9 @@		@@ -28,9 +28,9 @@
28	{% highlight result.description with query max_length "150" %}	28	{% highlight result.description with query max_length "150" %}
29	{% else %}	29	{% else %}
30	{% if result.latest_description %}	30	{% if result.latest_description %}
31	- {{ result.latest_description\|escape\|truncatechars:150 }}	31	+ {{ result.latest_description\|striptags\|escape\|truncatechars:150 }}
32	{% elif result.description %}	32	{% elif result.description %}
33	- {{ result.description\|escape\|truncatechars:150 }}	33	+ {{ result.description\|striptags\|escape\|truncatechars:150 }}
34	{% endif %}	34	{% endif %}
35	{% endif %}	35	{% endif %}
36	</span>	36	</span>