diff app/views/common/feed.atom.builder @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/views/common/feed.atom.builder	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/views/common/feed.atom.builder	Tue Sep 09 09:29:00 2014 +0100
@@ -1,9 +1,10 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-  xml.title   truncate_single_line(@title, :length => 100)
+  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.id      url_for(:controller => 'welcome', :only_path => false)
+  xml.icon    favicon_url
   xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
   xml.author  { xml.name "#{Setting.app_title}" }
   xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
@@ -11,9 +12,9 @@
     xml.entry do
       url = url_for(item.event_url(:only_path => false))
       if @project
-        xml.title truncate_single_line(item.event_title, :length => 100)
+        xml.title truncate_single_line_raw(item.event_title, 100)
       else
-        xml.title truncate_single_line("#{item.project} - #{item.event_title}", :length => 100)
+        xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100)
       end
       xml.link "rel" => "alternate", "href" => url
       xml.id url