diff --git a/apps/newsletters/models.py b/apps/newsletters/models.py index 25499429f..41ba62d24 100644 --- a/apps/newsletters/models.py +++ b/apps/newsletters/models.py @@ -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'], diff --git a/media/js/newsblur/models/stories.js b/media/js/newsblur/models/stories.js index 98d2a792b..d87f9de2e 100644 --- a/media/js/newsblur/models/stories.js +++ b/media/js/newsblur/models/stories.js @@ -47,6 +47,11 @@ NEWSBLUR.Models.Story = Backbone.Model.extend({ } }, + story_authors: function() { + return this.get('story_authors').replace(//g, '>'); + }, + formatted_short_date: function() { var timestamp = this.get('story_timestamp'); var dateformat = NEWSBLUR.assets.preference('dateformat'); diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js index bfb94ec8b..da26ee74d 100644 --- a/media/js/newsblur/views/story_detail_view.js +++ b/media/js/newsblur/views/story_detail_view.js @@ -170,11 +170,11 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ <% } %>\ <%= story.formatted_long_date() %>\ \ - <% if (story.get("story_authors")) { %>\ + <% if (story.story_authors()) { %>\
\ <% } %>\ diff --git a/media/js/newsblur/views/story_title_view.js b/media/js/newsblur/views/story_title_view.js index c93898210..96435cf4c 100644 --- a/media/js/newsblur/views/story_title_view.js +++ b/media/js/newsblur/views/story_title_view.js @@ -64,7 +64,7 @@ NEWSBLUR.Views.StoryTitleView = Backbone.View.extend({ \ \ <%= story.get("story_title") %>\ - \ + \ <% if (show_content_preview) { %>\