rendered paste body=== trac/db_default.py==================================================================--- trac/db_default.py (revision 4721)+++ trac/db_default.py (local)@@ -397,7 +397,7 @@ ('project', 'name', 'My Project'), ('project', 'descr', 'My example project'), ('project', 'url', 'http://example.com/'),- ('project', 'icon', 'trac.ico'),+ ('project', 'icon', 'common/trac.ico'), ('project', 'footer', ' Visit the Trac open source project at<br />' '<a href="http://trac.edgewall.com/">http://trac.edgewall.com/</a>'),@@ -408,7 +408,7 @@ ('ticket', 'default_component', 'component1'), ('ticket', 'restrict_owner', 'false'), ('header_logo', 'link', 'http://trac.edgewall.com/'),- ('header_logo', 'src', 'trac_banner.png'),+ ('header_logo', 'src', 'common/trac_banner.png'), ('header_logo', 'alt', 'Trac'), ('header_logo', 'width', '236'), ('header_logo', 'height', '73'),=== trac/web/chrome.py==================================================================--- trac/web/chrome.py (revision 4721)+++ trac/web/chrome.py (local)@@ -206,8 +206,11 @@ add_stylesheet(req, 'common/css/trac.css') icon = self.config.get('project', 'icon') if icon:- if icon[0] != '/' and icon.find('://') == -1:- icon = href.chrome('common', icon)+ if not icon.startswith('/') and icon.find('://') == -1:+ if '/' in icon:+ icon = href.chrome(icon)+ else:+ icon = href.chrome('common', icon) mimetype = mimeview.get_mimetype(icon) add_link(req, 'icon', icon, mimetype=mimetype) add_link(req, 'shortcut icon', icon, mimetype=mimetype)@@ -219,7 +222,10 @@ logo_src_abs = logo_src.startswith('http://') or \ logo_src.startswith('https://') if not logo_src.startswith('/') and not logo_src_abs:- logo_src = href.chrome('common', logo_src)+ if '/' in logo_src:+ logo_src = href.chrome(logo_src)+ else:+ logo_src = href.chrome('common', logo_src) req.hdf['chrome.logo'] = { 'link': util.escape(logo_link), 'src': util.escape(logo_src), 'src_abs': util.escape(logo_src_abs),