diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-11 18:02:25 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-11 18:02:25 +0100 |
| commit | 8d04d8a492a7d0a78802bd89998006352b910581 (patch) | |
| tree | 25b657eb27b3ba3481e0ea3378bc96d4ae8c7eb9 /app/controllers/general_controller.rb | |
| parent | fa0e54a733b3e22d70e1ae4f4c61906de92fcf0a (diff) | |
Handle the case where the blog feed already has querystring parameters.
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 150b433ec..21a318938 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -71,7 +71,9 @@ class GeneralController < ApplicationController def blog medium_cache @feed_autodetect = [] - @feed_url = "#{Configuration::blog_feed}?lang=#{self.locale_from_params()}" + @feed_url = Configuration::blog_feed + separator = @feed_url.include?('?') ? '&' : '?' + @feed_url = "#{@feed_url}#{separator}lang=#{self.locale_from_params()}" @blog_items = [] if not @feed_url.empty? content = quietly_try_to_open(@feed_url) |