diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index f82404d86..5e9278bca 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -98,7 +98,7 @@ def feed_autocomplete(request): 'label': feed.feed_title, 'tagline': feed.data and feed.data.feed_tagline, 'num_subscribers': feed.num_subscribers, - } for feed in feeds] + } for feed in feeds if feed] feeds = sorted(feeds, key=lambda f: -1 * f['num_subscribers']) feed_ids = [f['id'] for f in feeds] diff --git a/apps/social/views.py b/apps/social/views.py index 27cd30ea4..ea6888863 100644 --- a/apps/social/views.py +++ b/apps/social/views.py @@ -1200,7 +1200,7 @@ def shared_stories_rss_feed(request, user_id, username): logging.user(request, "~FBGenerating ~SB%s~SN's RSS feed: ~FM%s" % ( user.username, - request.META['HTTP_USER_AGENT'][:24] + request.META.get('HTTP_USER_AGENT', "")[:24] )) return HttpResponse(rss.writeString('utf-8'), content_type='application/rss+xml') diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index d1e5800b2..979ef5056 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -186,7 +186,7 @@ if ((NEWSBLUR.reader.layout.contentLayout.panes.north && NEWSBLUR.reader.layout.contentLayout.panes.north.width() < 600) || (NEWSBLUR.reader.layout.contentLayout.panes.center && - NEWSBLUR.reader.layout.contentLayout.panes.center.width() < 700)) { + NEWSBLUR.reader.layout.contentLayout.panes.center.width() < 720)) { this.$s.$feed_view.addClass('NB-feed-story-view-narrow'); this.$s.$text_view.addClass('NB-feed-story-view-narrow'); } else {