diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:11:02 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:19:05 +0100 |
| commit | 5c3881bfacdb34a605ddfbadf1531d0e341d7beb (patch) | |
| tree | 088e752d1a6d2fb38d1409dbfb1cb332af92594c /app/controllers/general_controller.rb | |
| parent | 15a174375e638b91c138d771d4851613110f9cdc (diff) | |
| parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) | |
merge from master and make tests pass
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index ffc97237a..4fa603aab 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -63,7 +63,7 @@ class GeneralController < ApplicationController end end - # Display WhatDoTheyKnow category from mySociety blog + # Display blog entries def blog medium_cache @feed_autodetect = [] @@ -73,7 +73,7 @@ class GeneralController < ApplicationController @data = XmlSimple.xml_in(content) @channel = @data['channel'][0] @blog_items = @channel['item'] - @feed_autodetect = [ { :url => feed_url, :title => "WhatDoTheyKnow blog"} ] + @feed_autodetect = [{:url => feed_url, :title => "#{site_name} blog"}] else @blog_items = [] end |