Permalink
Browse files

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.
  • Loading branch information...
SamSaffron committed Oct 2, 2015
1 parent 2c384ae commit 38f50d3bcc035f5ac1bd5040b8de76999f82e308
Showing with 6 additions and 5 deletions.
  1. +6 −5 app/views/layouts/_head.html.erb
@@ -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 %>

0 comments on commit 38f50d3

Please sign in to comment.