FIX: stop rendering blank urls for icons

You get an instant double request if you allow rendering of "" as
a favicon or apple touch icon.
This commit is contained in:
Sam 2015-10-02 10:12:58 +10:00
parent 2c384aec83
commit 38f50d3bcc
1 changed files with 6 additions and 5 deletions

View File

@ -1,13 +1,14 @@
<meta name="author" content="">
<meta name="generator" content="Discourse <%= Discourse::VERSION::STRING %> - https://github.com/discourse/discourse version <%= Discourse.git_version %>">
<%- if SiteSetting.favicon_url.present? %>
<link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
<%- end %>
<%- if SiteSetting.apple_touch_icon_url.present? %>
<link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
<% if SiteSetting.apple_touch_icon_url != "/images/default-apple-touch-icon.png" %>
<%- end %>
<%- if (SiteSetting.apple_touch_icon_url != "/images/default-apple-touch-icon.png") && SiteSetting.apple_touch_icon_url.present? %>
<link rel="icon" sizes="144x144" href="<%=SiteSetting.apple_touch_icon_url%>">
<% end %>
<%- end %>
<meta name="theme-color" content="#<%= ColorScheme.hex_for_name('header_background') %>">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
<%= canonical_link_tag %>