From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 29 Jul 2010 15:03:11 +0000 (+0000)
Subject: Merged r3894 from trunk.
X-Git-Tag: 1.0.1~69
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=677fee310a17bcef7404f936c8fad962c5b65c29;p=redmine.git

Merged r3894 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3896 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 054bac8af..4d698a234 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -783,6 +783,10 @@ module ApplicationHelper
     end
   end
 
+  def favicon
+    "<link rel='shortcut icon' href='#{Redmine::Utils.relative_url_root}/favicon.ico' />"
+  end
+
   private
 
   def wiki_helper
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 1873191c0..9521457d6 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -5,6 +5,7 @@
 <title><%=h html_title %></title>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
+<%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
 <%= javascript_include_tag :defaults %>
 <%= heads_for_wiki_formatter %>