From 7e253f4fcd9336b45139dd815cdeab61eab7338c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?=
 <francois.gaillard@prestashop.com>
Date: Mon, 30 Jan 2012 14:17:18 +0000
Subject: [PATCH] [-] Classes : Undefined index on cities (addresses) corrected

---
 cache/class_index.php        | 26 +++++++++++++-------------
 themes/default/addresses.tpl |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cache/class_index.php b/cache/class_index.php
index 3402e677c..bd956a106 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -434,7 +434,7 @@
   'NotificationCore' => 'classes/Notification.php',
   'ObjectModel' => 'override/classes/ObjectModel.php',
   'ObjectModelCore' => 'classes/ObjectModel.php',
-  'Order' => 'override/classes/order/Order.php',
+  'Order' => 'override/classes/Order.php',
   'OrderCarrier' => 'override/classes/order/OrderCarrier.php',
   'OrderCarrierCore' => 'classes/order/OrderCarrier.php',
   'OrderCartRule' => 'override/classes/order/OrderCartRule.php',
@@ -444,37 +444,37 @@
   'OrderController' => 'override/controllers/front/OrderController.php',
   'OrderControllerCore' => 'controllers/front/OrderController.php',
   'OrderCore' => 'classes/order/Order.php',
-  'OrderDetail' => 'override/classes/order/OrderDetail.php',
+  'OrderDetail' => 'override/classes/OrderDetail.php',
   'OrderDetailController' => 'override/controllers/front/OrderDetailController.php',
   'OrderDetailControllerCore' => 'controllers/front/OrderDetailController.php',
   'OrderDetailCore' => 'classes/order/OrderDetail.php',
-  'OrderDiscount' => 'override/classes/order/OrderDiscount.php',
+  'OrderDiscount' => 'override/classes/OrderDiscount.php',
   'OrderDiscountCore' => 'classes/order/OrderDiscount.php',
   'OrderFollowController' => 'override/controllers/front/OrderFollowController.php',
   'OrderFollowControllerCore' => 'controllers/front/OrderFollowController.php',
-  'OrderHistory' => 'override/classes/order/OrderHistory.php',
+  'OrderHistory' => 'override/classes/OrderHistory.php',
   'OrderHistoryCore' => 'classes/order/OrderHistory.php',
   'OrderInvoice' => 'override/classes/order/OrderInvoice.php',
   'OrderInvoiceCore' => 'classes/order/OrderInvoice.php',
-  'OrderMessage' => 'override/classes/order/OrderMessage.php',
+  'OrderMessage' => 'override/classes/OrderMessage.php',
   'OrderMessageCore' => 'classes/order/OrderMessage.php',
   'OrderOpcController' => 'override/controllers/front/OrderOpcController.php',
   'OrderOpcControllerCore' => 'controllers/front/OrderOpcController.php',
   'OrderPayment' => 'override/classes/order/OrderPayment.php',
   'OrderPaymentCore' => 'classes/order/OrderPayment.php',
-  'OrderReturn' => 'override/classes/order/OrderReturn.php',
+  'OrderReturn' => 'override/classes/OrderReturn.php',
   'OrderReturnController' => 'override/controllers/front/OrderReturnController.php',
   'OrderReturnControllerCore' => 'controllers/front/OrderReturnController.php',
   'OrderReturnCore' => 'classes/order/OrderReturn.php',
-  'OrderReturnState' => 'override/classes/order/OrderReturnState.php',
+  'OrderReturnState' => 'override/classes/OrderReturnState.php',
   'OrderReturnStateCore' => 'classes/order/OrderReturnState.php',
-  'OrderSlip' => 'override/classes/order/OrderSlip.php',
+  'OrderSlip' => 'override/classes/OrderSlip.php',
   'OrderSlipController' => 'override/controllers/front/OrderSlipController.php',
   'OrderSlipControllerCore' => 'controllers/front/OrderSlipController.php',
   'OrderSlipCore' => 'classes/order/OrderSlip.php',
-  'OrderState' => 'override/classes/order/OrderState.php',
+  'OrderState' => 'override/classes/OrderState.php',
   'OrderStateCore' => 'classes/order/OrderState.php',
-  'PDF' => 'override/classes/pdf/PDF.php',
+  'PDF' => 'override/classes/PDF.php',
   'PDFCore' => 'classes/pdf/PDF.php',
   'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php',
   'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php',
@@ -556,7 +556,7 @@
   'StateCore' => 'classes/State.php',
   'StatisticsController' => 'override/controllers/front/StatisticsController.php',
   'StatisticsControllerCore' => 'controllers/front/StatisticsController.php',
-  'Stock' => 'override/classes/stock/Stock.php',
+  'Stock' => 'override/classes/Stock.php',
   'StockAvailable' => 'override/classes/stock/StockAvailable.php',
   'StockAvailableCore' => 'classes/stock/StockAvailable.php',
   'StockCore' => 'classes/stock/Stock.php',
@@ -567,9 +567,9 @@
   'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
   'StockManagerModule' => 'override/classes/stock/StockManagerModule.php',
   'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php',
-  'StockMvt' => 'override/classes/stock/StockMvt.php',
+  'StockMvt' => 'override/classes/StockMvt.php',
   'StockMvtCore' => 'classes/stock/StockMvt.php',
-  'StockMvtReason' => 'override/classes/stock/StockMvtReason.php',
+  'StockMvtReason' => 'override/classes/StockMvtReason.php',
   'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php',
   'StockMvtWS' => 'override/classes/stock/StockMvtWS.php',
   'StockMvtWSCore' => 'classes/stock/StockMvtWS.php',
diff --git a/themes/default/addresses.tpl b/themes/default/addresses.tpl
index 352197968..6f1f46c0f 100644
--- a/themes/default/addresses.tpl
+++ b/themes/default/addresses.tpl
@@ -106,8 +106,8 @@
 				{assign var=addressKey value=" "|explode:$pattern}
 				<li>
 				{foreach from=$addressKey item=key name="word_loop"}
-					<span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">
-						{$address.formated[$key]|escape:'htmlall':'UTF-8'}
+					<span{if isset($addresses_style[$key])} class="{$addresses_style[$key]}"{/if}>
+						{$address.formated[$key|replace:',':'']|escape:'htmlall':'UTF-8'}
 					</span>
 				{/foreach}
 				</li>