Use @image_url@ for @favicon_url@ (#40087).

Patch by Go Maeda (@maeda).

git-svn-id: https://svn.redmine.org/redmine/trunk@22618 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a82163b76a89d9acf045822779bb1c6608242020..4d87f60757686af0dc1a55b01e1aeb820c32cddf 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1759,10 +1759,7 @@ module ApplicationHelper
 
   # Returns the full URL to the favicon
   def favicon_url
-    # TODO: use #image_url introduced in Rails4
-    path = favicon_path
-    base = url_for(:controller => 'welcome', :action => 'index', :only_path => false)
-    base.sub(%r{/+$}, '') + '/' + path.sub(%r{^/+}, '')
+    image_url(favicon_path)
   end
 
   def robot_exclusion_tag