From 7e1ac5572e31ec4b21f9180ba112925eaa91abde Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Tue, 23 Aug 2011 08:58:07 +0000
Subject: [PATCH] // validateControler is now deprecated

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8158 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/ObjectModel.php            | 2 ++
 controllers/AuthController.php     | 4 ++--
 controllers/IdentityController.php | 2 +-
 controllers/OrderOpcController.php | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index a1869a3ed..e0251c7c9 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -534,9 +534,11 @@ abstract class ObjectModelCore
 
 	/**
 	* TODO: refactor rename all calls to this to validateController
+	* @deprecated since 1.5 use validateController instead
 	*/
 	public function validateControler($htmlentities = true)
 	{
+		Tools::displayAsDeprecated();
 		return $this->validateController($htmlentities);
 	}
 
diff --git a/controllers/AuthController.php b/controllers/AuthController.php
index 220ffffbc..1eef601cd 100644
--- a/controllers/AuthController.php
+++ b/controllers/AuthController.php
@@ -83,13 +83,13 @@ class AuthControllerCore extends FrontController
 			$_POST['firstname'] = $_POST['customer_firstname'];
 			if (!Tools::getValue('phone') AND !Tools::getValue('phone_mobile'))
 				$this->errors[] = Tools::displayError('You must register at least one phone number');
-			$this->errors = array_unique(array_merge($this->errors, $customer->validateControler()));
+			$this->errors = array_unique(array_merge($this->errors, $customer->validateController()));
 			/* Preparing address */
 			$address = new Address();
 			$_POST['lastname'] = $lastnameAddress;
 			$_POST['firstname'] = $firstnameAddress;
 			$address->id_customer = 1;
-			$this->errors = array_unique(array_merge($this->errors, $address->validateControler()));
+			$this->errors = array_unique(array_merge($this->errors, $address->validateController()));
 
 			/* US customer: normalize the address */
 			if($address->id_country == Country::getByIso('US'))
diff --git a/controllers/IdentityController.php b/controllers/IdentityController.php
index 38e1b3ca8..dd69e1513 100644
--- a/controllers/IdentityController.php
+++ b/controllers/IdentityController.php
@@ -67,7 +67,7 @@ class IdentityControllerCore extends FrontController
 				else
 				{
 					$prev_id_default_group = $customer->id_default_group;
-					$this->errors = $customer->validateControler();
+					$this->errors = $customer->validateController();
 				}
 				if (!sizeof($this->errors))
 				{
diff --git a/controllers/OrderOpcController.php b/controllers/OrderOpcController.php
index f048c32f3..a3d433e01 100644
--- a/controllers/OrderOpcController.php
+++ b/controllers/OrderOpcController.php
@@ -96,7 +96,7 @@ class OrderOpcControllerCore extends ParentOrderController
 								$this->context->customer->birthday = (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days');
 							$_POST['lastname'] = $_POST['customer_lastname'];
 							$_POST['firstname'] = $_POST['customer_firstname'];
-							$this->errors = $this->context->customer->validateControler();
+							$this->errors = $this->context->customer->validateController();
 							$this->context->customer->newsletter = (int)Tools::isSubmit('newsletter');
 							$this->context->customer->optin = (int)Tools::isSubmit('optin');
 							$return = array(