From faf78b7f826bfed04a756aa9875345a323fbb630 Mon Sep 17 00:00:00 2001
From: Nicolas Florentin <nicolas@sleede.com>
Date: Mon, 25 Apr 2016 17:55:37 +0200
Subject: [PATCH] fix bug custom asset favicon-file favicon file is not set

---
 app/views/application/index.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index c6fad0b2a..8e0c4601d 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -54,8 +54,10 @@
   <% end %>
   <base href="/"></base>
 
-  <link rel="shortcut icon" type="image/x-icon" href="<%= CustomAsset.get_url('favicon-file') %>">
-  <link rel="shortcut icon" type="image/ico" href="<%= CustomAsset.get_url('favicon-file') %>">
+  <% if CustomAsset.get_url('favicon-file') %>
+    <link rel="shortcut icon" type="image/x-icon" href="<%= CustomAsset.get_url('favicon-file') %>">
+    <link rel="shortcut icon" type="image/ico" href="<%= CustomAsset.get_url('favicon-file') %>">
+  <% end %>
 
 
   <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->