Index: branches/5.2.x/units/orders/orders_item.php
===================================================================
diff -u -N -r13845 -r14099
--- branches/5.2.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 13845)
+++ branches/5.2.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 14099)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_item.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: orders_item.php 14099 2010-12-28 18:08:32Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,9 +16,10 @@
 	class OrdersItem extends kDBItem
 	{
 
-		function OrdersItem()
+		public function __construct()
 		{
-			parent::kDBItem();
+			parent::__construct();
+
 			$this->ErrorMsgs['credit_card_validation_error'] = $this->Application->Phrase('lu_cc_validation_error');
 			$this->ErrorMsgs['credit_card_expired'] = $this->Application->Phrase('lu_cc_expired');
 		}
@@ -30,15 +31,15 @@
 		 * @return string
 		 * @access public
 		 */
-		function GetErrorMsg($field)
+		public function GetErrorMsg($field, $force_escape = null)
 		{
-			if( $field != 'OrderNumber' ) return parent::GetErrorMsg($field);
+			if( $field != 'OrderNumber' ) return parent::GetErrorMsg($field, $force_escape);
 
-			$number['error'] = parent::GetErrorMsg('Number');
-			$number['pseudo'] = getArrayValue($this->FieldErrors['Number'], 'pseudo');
+			$number['error'] = parent::GetErrorMsg('Number', $force_escape);
+			$number['pseudo'] = $this->GetErrorPseudo('Number');
 
-			$subnumber['error'] = parent::GetErrorMsg('SubNumber');
-			$subnumber['pseudo'] = getArrayValue($this->FieldErrors['SubNumber'], 'pseudo');
+			$subnumber['error'] = parent::GetErrorMsg('SubNumber', $force_escape);
+			$subnumber['pseudo'] = $this->GetErrorPseudo('SubNumber');
 
 			// if pseudo match & not empty -> return 1st
 			// if one of pseudos not empty -> return it
@@ -293,7 +294,7 @@
 				}
 			}
 
-			if (defined('DEBUG_MODE') && constOn('DBG_PAYMENT_GW')) {
+			if (defined('DEBUG_MODE') && kUtil::constOn('DBG_PAYMENT_GW')) {
 				$gw_data = $this->getGatewayData();
 				$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
 				$gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] );
@@ -307,7 +308,7 @@
 			// Innocent until proven guilty
 			$cc_valid = true;
 
-			//  Get rid of any non-digits			
+			//  Get rid of any non-digits
 			$value = preg_replace('/[^\d]/', '', $value);
 
 			//  Perform card-specific checks, if applicable
@@ -338,7 +339,7 @@
 					break;
 
 				default:
-					$this->FieldErrors[$error_field]['pseudo'] = 'credit_card_validation_error';
+					$this->SetError($error_field, 'credit_card_validation_error');
 					return false;
 					break;
 			}
@@ -376,7 +377,7 @@
 			}
 			else
 			{
-				$this->FieldErrors[$error_field]['pseudo'] = 'credit_card_validation_error';
+				$this->SetError($error_field, 'credit_card_validation_error');
 				return false;
 			}
 		}
@@ -405,7 +406,7 @@
 
 					if ($cc_date < $now_date) {
 						$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
-						$this->FieldErrors[$error_field]['pseudo'] = 'credit_card_expired';
+						$this->SetError($error_field, 'credit_card_expired');
 
 						return false;
 					}