summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 19:55:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 19:55:07 +0000
commitf4e7765e0101dcc869d0457bf581932c3c024944 (patch)
treef0535cae32cb8fd9cff03ef086f0fe47368f85de /app/views/common
parentb2044e6dfc261656ee477fa0287c98bda3fa183d (diff)
downloadredmine-f4e7765e0101dcc869d0457bf581932c3c024944.tar.gz
redmine-f4e7765e0101dcc869d0457bf581932c3c024944.zip
Don't generate urls with params.
git-svn-id: http://svn.redmine.org/redmine/trunk@15632 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/feed.atom.builder4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder
index 74cebc582..893400dea 100644
--- a/app/views/common/feed.atom.builder
+++ b/app/views/common/feed.atom.builder
@@ -1,8 +1,8 @@
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.title truncate_single_line_raw(@title, 100)
- xml.link "rel" => "self", "href" => url_for(params.merge(:only_path => false))
- xml.link "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
+ xml.link "rel" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom')
+ xml.link "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false)
xml.id home_url
xml.icon favicon_url
xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)