Merge branch 'release/0.5' into develop

Conflicts:
	lib/alaveteli_external_command.rb

1 files changed, 8 insertions, 7 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 6cdfb9d5f..d28f4deec 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -71,14 +71,15 @@ class GeneralController < ApplicationController
         medium_cache
         @feed_autodetect = []
         @feed_url = "#{MySociety::Config.get('BLOG_FEED', '')}?lang=#{self.locale_from_params()}"
+        @blog_items = []
         if not @feed_url.empty?
-            content = open(@feed_url).read
-            @data = XmlSimple.xml_in(content)
-            @channel = @data['channel'][0]
-            @blog_items = @channel['item']
-            @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}]
-        else
-            @blog_items = []
+            content = quietly_try_to_open(@feed_url)
+            if !content.empty?
+                @data = XmlSimple.xml_in(content)
+                @channel = @data['channel'][0]
+                @blog_items = @channel['item']
+                @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}]
+            end
         end
         @twitter_user = MySociety::Config.get('TWITTER_USERNAME', '')
     end