Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

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}';
 	</script>
 {/if}
 {if isset($css_files)}

admin-dev/themes/default/template/helpers/list/list_header.tpl

@@ -214,7 +214,7 @@
 								{$params.title}
 							{/if}
 
-							{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
+							{if (!isset($params.orderby) || $params.orderby) && !$simple_header && $show_filters}
 							<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if}  href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
 								<i class="icon-caret-down"></i>
 							</a>