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 054bac8af7d5727066ee74e0b255425b5707de71..4d698a2348e934ebfca1d601256ed7dfed7abcf4 100644 (file)
--- 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 1873191c07584f45517ae4b97d19c7ada4fff54b..9521457d664bab99a8bdb59e6eb311677af362eb 100644 (file)
--- 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 %>