From 05c2b989293d309c37f074fc24294d6c57ddf653 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Sat, 19 Dec 2015 10:48:52 +0100
Subject: [PATCH] Fix #523 locale in url with base_url_* variables, even if
 include_default_lang is set to false

---
 system/src/Grav/Common/Twig/Twig.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 0f5f4b97d..0b3be023c 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -80,7 +80,10 @@ class Twig
 
             $active_language = $language->getActive();
 
-            $language_append = $active_language ? '/'.$active_language : '';
+            $language_append = '';
+            if ($language->getDefault() != $active_language || $config->get('system.languages.include_default_lang') === true) {
+                $language_append = $active_language ? '/' . $active_language : '';
+            }
 
             // handle language templates if available
             if ($language->enabled()) {