From 5a9ba91f12b4af4c32d9b37d36510242af035081 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Thu, 26 Jan 2012 13:28:35 +0000
Subject: [PATCH] [-] BO : #PSTEST-575 - Replace a || by a &&

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12713 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminOrdersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 3b6e84653..4f1837216 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -293,7 +293,7 @@ class AdminOrdersControllerCore extends AdminController
 					// TODO review
 					$rules = call_user_func(array('Message', 'getValidationRules'), 'Message');
 					foreach ($rules['required'] as $field)
-						if (($value = Tools::getValue($field)) == false || (string)$value != '0')
+						if (($value = Tools::getValue($field)) == false && (string)$value != '0')
 							if (!Tools::getValue('id_'.$this->table) || $field != 'passwd')
 								$this->errors[] = Tools::displayError('field').' <b>'.$field.'</b> '.Tools::displayError('is required.');
 					foreach ($rules['size'] as $field => $maxLength)