Fix #523 locale in url with base_url_* variables, even if include_default_lang is set to false

This commit is contained in:
Flavio Copes
2015-12-19 10:48:52 +01:00
parent c5d3098b25
commit 05c2b98929

View File

@@ -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()) {