diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 11:22:46 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 11:22:46 +0000 |
| commit | 8b999962dec50fc4599f77c1a23fbdc7b43dab21 (patch) | |
| tree | bb9f2f7ea5bffa7f50779af1e129f4ed787f3944 /app/helpers | |
| parent | 2db3338ab22ffbccb69b51c97baeba51646ac1e3 (diff) | |
| download | redmine-8b999962dec50fc4599f77c1a23fbdc7b43dab21.tar.gz redmine-8b999962dec50fc4599f77c1a23fbdc7b43dab21.zip | |
Make favicon themeable (#15689).
Patch by Felix Schäfer modified by Jean-Philippe Lang.
git-svn-id: http://svn.redmine.org/redmine/trunk@12646 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cf7c11740..617a9029b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1270,7 +1270,8 @@ module ApplicationHelper end def favicon - "<link rel='shortcut icon' href='#{image_path('/favicon.ico')}' />".html_safe + fav_path = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico' + "<link rel='shortcut icon' href='#{image_path(fav_path)}' />".html_safe end def robot_exclusion_tag |