Follow trunk before migration and don't fill the snippets on the

history page
 - Legacy-Id: 4320
This commit is contained in:
Ole Laursen 2012-04-25 12:06:00 +00:00
parent d176d2b161
commit 441ca9fb9e

View file

@ -445,7 +445,7 @@ def ad_area(user):
def format_history_text(text):
"""Run history text through some cleaning and add ellipsis if it's too long."""
full = mark_safe(sanitize_html(keep_spacing(linebreaksbr(urlize(mark_safe(text))))))
snippet = truncatewords_html(format_textarea(fill(text, 80)), 25)
snippet = truncatewords_html(format_textarea(text), 25)
if snippet[-3:] == "...":
return mark_safe(u'<div class="snippet">%s<span class="showAll">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
return full