From dee3ee9e1b9f61de86a3a882fff3eb69fcf60110 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 10 Dec 2015 18:16:53 +0100
Subject: [PATCH 1/2] Fix favicon base

---
 themes/grav/templates/partials/base.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig
index 468e46c6..3b7d127d 100644
--- a/themes/grav/templates/partials/base.html.twig
+++ b/themes/grav/templates/partials/base.html.twig
@@ -13,7 +13,7 @@
         <meta name="robots" content="{{ header.robots }}">
     {% endif %}
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" href="{{ base_url_relative_frontend }}{{ theme_url }}/images/favicon.png">
+    <link rel="icon" type="image/png" href="{{ base_url_simple }}{{ theme_url }}/images/favicon.png">
 
     {% block stylesheets %}
         {% do assets.addCss(theme_url~'/css-compiled/nucleus.css') %}

From 88550797e3131289449161778cbf26663c0c9282 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 10 Dec 2015 18:17:09 +0100
Subject: [PATCH 2/2] Revert "Fix issue in base_url_relative_frontend on sites
 not running on a subfolder"

This reverts commit 11557780f1eab0865dfa13a9f390c5729d69d591.
---
 admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin.php b/admin.php
index 8b5732f2..b0182fb9 100644
--- a/admin.php
+++ b/admin.php
@@ -271,7 +271,7 @@ class AdminPlugin extends Plugin
         $ext = '.' . ($format ? $format : 'html') . TWIG_EXT;
 
         $twig->twig_vars['location'] = $this->template;
-        $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '';
+        $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/';
         $twig->twig_vars['admin_route'] = trim($this->config->get('plugins.admin.route'), '/');
         $twig->twig_vars['base_url_relative'] =
             $twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route'];