From 198731de231ef4661be19ee49b509d962791f835 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 2 Jul 2014 13:53:04 +1000
Subject: [PATCH] FIX: 100% cpu while parsing feeds
---
app/jobs/scheduled/poll_feed.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb
index 3219fc09b..652705035 100644
--- a/app/jobs/scheduled/poll_feed.rb
+++ b/app/jobs/scheduled/poll_feed.rb
@@ -42,7 +42,10 @@ module Jobs
class Feed
require 'simple-rss'
- SimpleRSS.item_tags << SiteSetting.embed_username_key_from_feed.to_sym
+
+ if SiteSetting.embed_username_key_from_feed.present?
+ SimpleRSS.item_tags << SiteSetting.embed_username_key_from_feed.to_sym
+ end
def initialize
@feed_url = SiteSetting.feed_polling_url