diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-06-04 14:23:03 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-06-04 14:23:03 +0000 |
| commit | 58938dd823033b4ead14ccd11ea9daac17ed3647 (patch) | |
| tree | 08817825dd05e6e51a8cca124e85828ca46197c0 /app/views/common | |
| parent | 92ae502f9ca2aa309e181c8b503e1e265fc004c7 (diff) | |
| download | redmine-58938dd823033b4ead14ccd11ea9daac17ed3647.tar.gz redmine-58938dd823033b4ead14ccd11ea9daac17ed3647.zip | |
URLs in atom feeds don't take into account Setting.protocol and Setting.hostname (#10535).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@19810 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
| -rw-r--r-- | app/views/common/feed.atom.builder | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder index 804ecfd0e..023c15601 100644 --- a/app/views/common/feed.atom.builder +++ b/app/views/common/feed.atom.builder @@ -1,10 +1,12 @@ # 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') - xml.link "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false) + 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.id home_url xml.icon favicon_url xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema) @@ -12,7 +14,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)) + url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host)) if @project xml.title truncate_single_line_raw(item.event_title, 100) else |