summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb5
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