fix-10535-without-test.patch

Go MAEDA, 2020-05-19 10:11

Download (1.6 KB)

View differences:

app/views/common/feed.atom.builder
1 1
# frozen_string_literal: true
2 2

  
3
protocol = Setting.protocol
4
host = Setting.host_name
3 5
xml.instruct!
4 6
xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
5 7
  xml.title   truncate_single_line_raw(@title, 100)
6
  xml.link    "rel" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom')
7
  xml.link    "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false)
8
  xml.link    "rel" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom', :protocol => protocol, :host => host)
9
  xml.link    "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false, :protocol => protocol, :host => host)
8 10
  xml.id      home_url
9 11
  xml.icon    favicon_url
10 12
  xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
......
12 14
  xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
13 15
  @items.each do |item|
14 16
    xml.entry do
15
      url = url_for(item.event_url(:only_path => false))
17
      url = url_for(item.event_url(:only_path => false, :protocol => protocol, :host => host))
16 18
      if @project
17 19
        xml.title truncate_single_line_raw(item.event_title, 100)
18 20
      else