Commits

Anonymous committed 91e2f23

Ported [2908] to 0.9-stable.

  • Participants
  • Parent commits fcd5dde
  • Branches 0.9-stable

Comments (0)

Files changed (2)

File templates/timeline_rss.cs

   <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link>
   <description>Trac Timeline</description>
   <language>en-us</language>
-  <generator>Trac v<?cs var:trac.version ?></generator>
-  <image>
-   <title><?cs var:project.name_encoded ?></title>
-   <url><?cs if:!header_logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs
-    var:header_logo.src ?></url>
-   <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link>
-  </image><?cs
+  <generator>Trac v<?cs var:trac.version ?></generator><?cs
+  if:chrome.logo.src ?>
+   <image>
+    <title><?cs var:project.name_encoded ?></title>
+    <url><?cs if:!chrome.logo.src_abs ?><?cs var:base_host ?><?cs /if ?><?cs
+     var:chrome.logo.src ?></url>
+    <link><?cs var:base_host ?><?cs var:trac.href.timeline ?></link>
+   </image><?cs
+  /if ?><?cs
   each:event = timeline.events ?>
    <item>
     <title><?cs var:event.title ?></title><?cs

File trac/web/chrome.py

                 else:
                     logo_src = href.chrome('common', logo_src)
             req.hdf['chrome.logo'] = {
-                'link': logo_link, 'src': logo_src,
-                'src_abs': logo_src_abs,
+                'link': logo_link, 'src': logo_src, 'src_abs': logo_src_abs,
                 'alt': self.config.get('header_logo', 'alt'),
                 'width': self.config.get('header_logo', 'width', ''),
                 'height': self.config.get('header_logo', 'height', '')