Merged r3899 from trunk

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4d698a2348e934ebfca1d601256ed7dfed7abcf4..e407589697424619f13892de1f82b9f3842aac1f 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -784,7 +784,7 @@ module ApplicationHelper
   end
 
   def favicon
-    "<link rel='shortcut icon' href='#{Redmine::Utils.relative_url_root}/favicon.ico' />"
+    "<link rel='shortcut icon' href='#{image_path('/favicon.ico')}' />"
   end
 
   private