From 5dd28cb1976da8e182465d5d2efc96ab5e58f7b7 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 14 Feb 2013 15:59:03 -0800 Subject: [PATCH] Fixing sharing story by email if the story has no feed. --- apps/reader/views.py | 2 +- media/js/newsblur/reader/reader_send_email.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/reader/views.py b/apps/reader/views.py index fca5bd0ad..521e17eb7 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1464,7 +1464,7 @@ def send_story_email(request): message = "Email error: %s" % str(e) logging.user(request, '~BMSharing story by email to %s recipient%s: ~FY~SB%s~SN~BM~FY/~SB%s' % (len(to_addresses), '' if len(to_addresses) == 1 else 's', - story['story_title'][:50], feed.feed_title[:50])) + story['story_title'][:50], feed and feed.feed_title[:50])) return {'code': code, 'message': message} diff --git a/media/js/newsblur/reader/reader_send_email.js b/media/js/newsblur/reader/reader_send_email.js index 23e996b92..1a1483221 100644 --- a/media/js/newsblur/reader/reader_send_email.js +++ b/media/js/newsblur/reader/reader_send_email.js @@ -43,10 +43,10 @@ _.extend(NEWSBLUR.ReaderSendEmail.prototype, { $.make('div', { className: 'NB-modal-error'}), $.make('h2', { className: 'NB-modal-title' }, 'Send Story by Email'), $.make('h2', { className: 'NB-modal-subtitle' }, [ - $.make('div', { className: 'NB-modal-email-feed' }, [ + (this.feed && $.make('div', { className: 'NB-modal-email-feed' }, [ $.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed) }), $.make('div', { className: 'NB-modal-feed-title' }, this.feed.get('feed_title')) - ]), + ])), $.make('div', { className: 'NB-modal-email-story-title' }, this.story.story_title), $.make('div', { className: 'NB-modal-email-story-permalink' }, this.story.story_permalink) ]),