diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2024-01-23 01:23:29 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2024-01-23 01:23:29 +0000 |
| commit | 28061fbcdb2cabbef698db2ca3a80cc428388456 (patch) | |
| tree | b8fa44707aeb4dbd16a751669d787c351f473429 /app/helpers/application_helper.rb | |
| parent | 2cd7198dc86804646447ce8b1de81b5ebac0061a (diff) | |
| download | redmine-28061fbcdb2cabbef698db2ca3a80cc428388456.tar.gz redmine-28061fbcdb2cabbef698db2ca3a80cc428388456.zip | |
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
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 5 |
1 files changed, 1 insertions, 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 |