diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-12-22 11:52:16 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-12-22 11:52:16 +0000 |
| commit | 843f13f7e207b6c0dffeb582db47176fd9fc1fa9 (patch) | |
| tree | 75cd92e013239187deb5f62146010463f8249381 /app/views/common | |
| parent | 87d2fa498d10ed716b38ba49e0c6e22dc23d7ef2 (diff) | |
| download | redmine-843f13f7e207b6c0dffeb582db47176fd9fc1fa9.tar.gz redmine-843f13f7e207b6c0dffeb582db47176fd9fc1fa9.zip | |
Revert r19810 (#10535).
git-svn-id: http://svn.redmine.org/redmine/trunk@20685 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
| -rw-r--r-- | app/views/common/feed.atom.builder | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder index ddf512256..13fda6b1b 100644 --- a/app/views/common/feed.atom.builder +++ b/app/views/common/feed.atom.builder @@ -1,12 +1,10 @@ # frozen_string_literal: true -protocol = Setting.protocol -host = Setting.host_name 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 => request.query_parameters, :only_path => false, :format => 'atom', :protocol => protocol, :host => host) - xml.link "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false, :protocol => protocol, :host => host) + 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) @@ -14,7 +12,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.generator(:uri => Redmine::Info.url) {xml.text! Redmine::Info.app_name} @items.each do |item| xml.entry do - url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host)) + url = url_for(item.event_url(:only_path => false)) if @project == item.project xml.title truncate_single_line_raw(item.event_title, 100) else |