Merge pull request #3456 from 5minpause/patch-1

Changes RSS item creation to prevent encoding errors
2015-08-14 18:19:58 +02:00 · 2015-08-14 18:19:58 +02:00 · a47370fc52
parent 183f6d89b8 4ee1bc6320
commit a47370fc52
1 changed files with 6 additions and 2 deletions
--- a/app/jobs/scheduled/poll_feed.rb
+++ b/app/jobs/scheduled/poll_feed.rb
@ -86,11 +86,15 @@ module Jobs
      end

      def content
-        @article_rss_item.content || @article_rss_item.description
+        if @article_rss_item.content
+          @article_rss_item.content.scrub
+        else
+          @article_rss_item.description.scrub
+        end
      end

      def title
-        @article_rss_item.title
+        @article_rss_item.title.scrub
      end

      def user