summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--public/images/favicon.ico (renamed from public/favicon.ico)bin7886 -> 7886 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bb17b8455..4054d3274 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1749,12 +1749,12 @@ module ApplicationHelper
end
def favicon
- "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe
+ favicon_link_tag(favicon_path, rel: "icon shortcut")
end
# Returns the path to the favicon
def favicon_path
- icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico'
+ icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : 'favicon.ico'
image_path(icon)
end
diff --git a/public/favicon.ico b/public/images/favicon.ico
index 9d48fcf98..9d48fcf98 100644
--- a/public/favicon.ico
+++ b/public/images/favicon.ico
Binary files differ