Newsletter authors no longer get escaped server-side. The web should know how to escape.

This commit is contained in:
Samuel Clay 2016-02-25 15:31:07 -08:00
parent 5dcfc20a84
commit d05f0fe162
4 changed files with 10 additions and 5 deletions

View file

@ -61,7 +61,7 @@ class EmailNewsletter:
"story_date": datetime.datetime.fromtimestamp(int(params['timestamp'])),
"story_title": params['subject'],
"story_content": story_content,
"story_author_name": escape(params['from']),
"story_author_name": params['from'],
"story_permalink": reverse('newsletter-story',
kwargs={'story_hash': story_hash}),
"story_guid": params['signature'],

View file

@ -47,6 +47,11 @@ NEWSBLUR.Models.Story = Backbone.Model.extend({
}
},
story_authors: function() {
return this.get('story_authors').replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
},
formatted_short_date: function() {
var timestamp = this.get('story_timestamp');
var dateformat = NEWSBLUR.assets.preference('dateformat');

View file

@ -170,11 +170,11 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
<% } %>\
<%= story.formatted_long_date() %>\
</div>\
<% if (story.get("story_authors")) { %>\
<% if (story.story_authors()) { %>\
<div class="NB-feed-story-author-wrapper">\
<span class="NB-middot">&middot;</span>\
<span class="NB-feed-story-author <% if (authors_score) { %>NB-score-<%= authors_score %><% } %>">\
<%= story.get("story_authors") %>\
<%= story.story_authors() %>\
</span>\
</div>\
<% } %>\

View file

@ -64,7 +64,7 @@ NEWSBLUR.Views.StoryTitleView = Backbone.View.extend({
<div class="NB-storytitles-star"></div>\
<div class="NB-storytitles-share"></div>\
<span class="NB-storytitles-title"><%= story.get("story_title") %></span>\
<span class="NB-storytitles-author"><%= story.get("story_authors") %></span>\
<span class="NB-storytitles-author"><%= story.story_authors() %></span>\
<% if (show_content_preview) { %>\
<div class="NB-storytitles-content-preview"><%= show_content_preview %></div>\
<% } %>\
@ -110,7 +110,7 @@ NEWSBLUR.Views.StoryTitleView = Backbone.View.extend({
</a>\
</div>\
<div class="NB-storytitles-grid-bottom">\
<span class="NB-storytitles-author"><%= story.get("story_authors") %></span>\
<span class="NB-storytitles-author"><%= story.story_authors() %></span>\
<span class="story_date NB-hidden-fade"><%= story.formatted_short_date() %></span>\
</div>\
<% if (story.get("comment_count_friends")) { %>\