Index: branches/5.1.x/units/orders/orders_item.php
===================================================================
diff -u -N -r13465 -r13549
--- branches/5.1.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 13465)
+++ branches/5.1.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 13549)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_item.php 13465 2010-04-28 15:08:00Z alex $
+* @version	$Id: orders_item.php 13549 2010-05-11 21:03:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -23,33 +23,6 @@
 			$this->ErrorMsgs['credit_card_expired'] = $this->Application->Phrase('lu_cc_expired');
 		}
 
-		function Load($id, $id_field_name=null)
-		{
-			if( $this->Special == 'sitem' && $id == null || (!$this->IsTempTable() && $id == 0))
-			{
-				$this->setID(0);
-
-				$this->SetDBField('Number',-1);
-				$this->SetDBField('SubNumber',-1);
-				// load previously used search params from session
-				$search_params = $this->Application->RecallVar('ord.search_search_filter');
-				if($search_params)
-				{
-					$search_params = unserialize($search_params);
-					foreach($search_params as $search_field => $search_params)
-					{
-						$this->SetField($search_field, $search_params['search_value']);
-					}
-					$this->UpdateFormattersSubFields(); // used for updating separate virtual date/time fields from DB timestamp (for example)
-				}
-				return true;
-			}
-			else
-			{
-				return parent::Load($id,$id_field_name);
-			}
-		}
-
 		/**
 		 * Return error message for field
 		 *
@@ -334,34 +307,34 @@
 			// Innocent until proven guilty
 			$cc_valid = true;
 
-			//  Get rid of any non-digits
-			$value = ereg_replace("[^[:digit:]]", '', $value);
+			//  Get rid of any non-digits			
+			$value = preg_replace('/[^\d]/', '', $value);
 
 			//  Perform card-specific checks, if applicable
 			switch( $this->GetDBField($cardtype_field) )
 			{
 				case 2: // MasterCard
-					$cc_valid = ereg("^5[1-5].{14}$", $value);
+					$cc_valid = preg_match('/^5[1-5].{14}$/', $value);
 					break;
 
 				case 1: // Visa
-					$cc_valid = ereg("^4.{15}$|^4.{12}$", $value);
+					$cc_valid = preg_match('/^4.{15}$|^4.{12}$/', $value);
 					break;
 
 				case 3: // American Express
-					$cc_valid = ereg("^3[47].{13}$", $value);
+					$cc_valid = preg_match('/^3[47].{13}$/', $value);
 					break;
 
 				case 4: // Discover
-					$cc_valid = ereg("^6011.{12}$", $value);
+					$cc_valid = preg_match('/^6011.{12}$/', $value);
 					break;
 
 				case 5: // Diners Club
-					$cc_valid = ereg("^30[0-5].{11}$|^3[68].{12}$", $value);
+					$cc_valid = preg_match('/^30[0-5].{11}$|^3[68].{12}$/', $value);
 					break;
 
 				case 6: // JBC
-					$cc_valid = ereg("^3.{15}$|^2131|1800.{11}$", $value);
+					$cc_valid = preg_match('/^3.{15}$|^2131|1800.{11}$/', $value);
 					break;
 
 				default: