From 28061fbcdb2cabbef698db2ca3a80cc428388456 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 23 Jan 2024 01:23:29 +0000 Subject: [PATCH] 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 --- app/helpers/application_helper.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a82163b76..4d87f6075 100644 --- 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