public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unescaping incorrectly escaped and linkified comments and replies.

Browse source
This commit is contained in:
Samuel Clay 2012-07-23 23:23:34 -07:00
parent fb6e3218ba
commit 72655a5116
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/mail/email_story_comment.xhtml
View file

@ -135,7 +135,7 @@
<div class="NB-story-comment-date">{{ comment.shared_date }} ago</div> <div class="NB-story-comment-date">{{ comment.shared_date }} ago</div>
</div> </div>
<div class="NB-story-comment-content"> <div class="NB-story-comment-content">
{{ comment.comments|linebreaksbr }} {{ comment.comments|linebreaksbr|safe }}
</div> </div>
{% if comment.replies %} {% if comment.replies %}
<div class="NB-story-comment-replies"> <div class="NB-story-comment-replies">
@ -146,7 +146,7 @@
</a> </a>
<a href="{{ reply.user.feed_link }}" class="NB-story-comment-username NB-story-comment-reply-username">{{ reply.user.username }}</a> <a href="{{ reply.user.feed_link }}" class="NB-story-comment-username NB-story-comment-reply-username">{{ reply.user.username }}</a>
<div class="NB-story-comment-date NB-story-comment-reply-date">{{ reply.publish_date }} ago</div> <div class="NB-story-comment-date NB-story-comment-reply-date">{{ reply.publish_date }} ago</div>
<div class="NB-story-comment-reply-content">{{ reply.comments }}</div> <div class="NB-story-comment-reply-content">{{ reply.comments|safe }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

2
templates/reader/activities_module.xhtml
View file

@ -69,7 +69,7 @@
</div> </div>
{% if activity.content %} {% if activity.content %}
<div class="NB-interaction-content"> <div class="NB-interaction-content">
"<span class="NB-interaction-sharedstory-content NB-splash-link">{{ activity.content|truncatewords:16 }}</span>" "<span class="NB-interaction-sharedstory-content NB-splash-link">{{ activity.content|safe|truncatewords:16 }}</span>"
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}

4
templates/social/story_comment.xhtml
View file

@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div class="NB-story-comment-content"> <div class="NB-story-comment-content">
{{ comment.comments|linebreaksbr }} {{ comment.comments|linebreaksbr|safe }}
</div> </div>
{% if comment.replies %} {% if comment.replies %}
<div class="NB-story-comment-replies"> <div class="NB-story-comment-replies">
@ -30,7 +30,7 @@
</a> </a>
<a href="{{ reply.user.feed_link }}" class="NB-story-comment-username NB-story-comment-reply-username">{{ reply.user.username }}</a> <a href="{{ reply.user.feed_link }}" class="NB-story-comment-username NB-story-comment-reply-username">{{ reply.user.username }}</a>
<div class="NB-story-comment-date NB-story-comment-reply-date">{{ reply.publish_date }} ago</div> <div class="NB-story-comment-date NB-story-comment-reply-date">{{ reply.publish_date }} ago</div>
<div class="NB-story-comment-reply-content">{{ reply.comments }}</div> <div class="NB-story-comment-reply-content">{{ reply.comments|safe }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

3
utils/story_functions.py
View file

@ -5,6 +5,7 @@ from django.utils.dateformat import DateFormat
from django.utils.html import strip_tags as strip_tags_django from django.utils.html import strip_tags as strip_tags_django
from django.conf import settings from django.conf import settings
from utils.tornado_escape import linkify as linkify_tornado from utils.tornado_escape import linkify as linkify_tornado
from utils.tornado_escape import xhtml_unescape as xhtml_unescape_tornado
def story_score(story, bottom_delta=None): def story_score(story, bottom_delta=None):
# A) Date - Assumes story is unread and within unread range # A) Date - Assumes story is unread and within unread range
@ -170,7 +171,7 @@ def strip_tags(html):
return s.get_data() return s.get_data()
def linkify(*args, **kwargs): def linkify(*args, **kwargs):
return linkify_tornado(*args, **kwargs) return xhtml_unescape_tornado(linkify_tornado(*args, **kwargs))
def truncate_chars(value, max_length): def truncate_chars(value, max_length):
if len(value) <= max_length: if len(value) <= max_length: