diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
| commit | 7414ed478f212be2b48c95fafde15726b348b197 (patch) | |
| tree | 1d89b90f604b837b097fb4274775c4f3b3a319d6 /app/controllers/general_controller.rb | |
| parent | 479c9cd4567e2042d00c347f25a411373a6b1df9 (diff) | |
| parent | d05082c1cf1ddec789e547b54943f6e7d5bdffc1 (diff) | |
Merge branch 'release/0.20'0.20.0.0
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 2 |
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 |