diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 617a9029b..200bc1c2c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1270,8 +1270,21 @@ module ApplicationHelper end def favicon - fav_path = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico' - "<link rel='shortcut icon' href='#{image_path(fav_path)}' />".html_safe + "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe + end + + # Returns the path to the favicon + def favicon_path + icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico' + image_path(icon) + end + + # 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{^/+},'') end def robot_exclusion_tag |