From 2d609ec93c305ac4485fd1d8c744d5ea58192654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 7 Nov 2013 17:43:26 +0100 Subject: [PATCH] // merge fixes --- admin-dev/themes/default/template/header.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index db2d00ad2..5d91b6780 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -71,7 +71,9 @@ var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}'; var currentIndex = '{$currentIndex|@addcslashes:'\''}'; var choose_language_translate = '{l s='Choose language' js=1}'; - var default_language = '{$default_language|addslashes}'; + var default_language = '{$default_language|intval}'; + var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}'; + var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}'; {/if} {if isset($css_files)}