From 8ba251c996d794899f4e92ea89ad85ab05ff685d Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Fri, 29 Nov 2013 16:40:00 +0100
Subject: [PATCH] // small clean

---
 themes/default-bootstrap/addresses.tpl        | 52 -------------------
 themes/default-bootstrap/authentication.tpl   |  3 --
 .../order-address-multishipping.tpl           | 29 -----------
 themes/default-bootstrap/order-address.tpl    | 34 ------------
 4 files changed, 118 deletions(-)

diff --git a/themes/default-bootstrap/addresses.tpl b/themes/default-bootstrap/addresses.tpl
index 8779feea7..5866c8370 100644
--- a/themes/default-bootstrap/addresses.tpl
+++ b/themes/default-bootstrap/addresses.tpl
@@ -23,58 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-*}
-
-{* Two variable are necessaries to display the address with the new layout system *}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($multipleAddresses)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop < 1.4.2 compatibility *}
-	{if isset($addresses)}
-		{$address_number = 0}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$multipleAddresses.$address_number.ordered.$address_key_number = $address_key}
-					{$multipleAddresses.$address_number.formated.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{$multipleAddresses.$address_number.object = $address}
-		{$address_number = $address_number  + 1}
-		{/foreach}
-	{/if}
-{/if}
-
-{* Define the style if it doesn't exist in the PrestaShop version*}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($addresses_style)}
-	{$addresses_style.company = 'address_company'}
-	{$addresses_style.vat_number = 'address_company'}
-	{$addresses_style.firstname = 'address_name'}
-	{$addresses_style.lastname = 'address_name'}
-	{$addresses_style.address1 = 'address_address1'}
-	{$addresses_style.address2 = 'address_address2'}
-	{$addresses_style.city = 'address_city'}
-	{$addresses_style.country = 'address_country'}
-	{$addresses_style.phone = 'address_phone'}
-	{$addresses_style.phone_mobile = 'address_phone_mobile'}
-	{$addresses_style.alias = 'address_title'}
-{/if}
-
 <script type="text/javascript">
 //<![CDATA[
 	{literal}
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl
index 56d75a82c..24e23c000 100644
--- a/themes/default-bootstrap/authentication.tpl
+++ b/themes/default-bootstrap/authentication.tpl
@@ -82,9 +82,6 @@ $(document).ready(function() {
 	<script type="text/javascript">
 	{literal}
 	$(document).ready(function(){
-		// Retrocompatibility with 1.4
-		if (typeof baseUri === "undefined" && typeof baseDir !== "undefined")
-		baseUri = baseDir;
 		$('#create-account_form').submit(function(){
 			submitFunction();
 			return false;
diff --git a/themes/default-bootstrap/order-address-multishipping.tpl b/themes/default-bootstrap/order-address-multishipping.tpl
index d917cf1db..0d30fd7dd 100644
--- a/themes/default-bootstrap/order-address-multishipping.tpl
+++ b/themes/default-bootstrap/order-address-multishipping.tpl
@@ -30,35 +30,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}	
-	
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
diff --git a/themes/default-bootstrap/order-address.tpl b/themes/default-bootstrap/order-address.tpl
index aafc8908d..1210bf24f 100644
--- a/themes/default-bootstrap/order-address.tpl
+++ b/themes/default-bootstrap/order-address.tpl
@@ -29,40 +29,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-** Syntax smarty for v2
-*}
-
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}