Merge branch 'empty_blog' into rails-3-develop

1 files changed, 1 insertions, 1 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 158492eb2..2c8abbaf4 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -32,7 +32,7 @@ class GeneralController < ApplicationController
             if !content.empty?
                 @data = XmlSimple.xml_in(content)
                 @channel = @data['channel'][0]
-                @blog_items = @channel['item']
+                @blog_items = @channel.fetch('item') { [] }
                 @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}]
             end
         end