Index: branches/5.1.x/install/upgrades.php
===================================================================
diff -u -N -r13100 -r13777
--- branches/5.1.x/install/upgrades.php	(.../upgrades.php)	(revision 13100)
+++ branches/5.1.x/install/upgrades.php	(.../upgrades.php)	(revision 13777)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: upgrades.php 13777 2010-06-15 20:28:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -15,26 +15,35 @@
 	$upgrade_class = 'InCommerceUpgrades';
 
 	/**
-	 * Class, that holds all upgrade scripts for "Core" module
+	 * Class, that holds all upgrade scripts for "In-Commerce" module
 	 *
 	 */
-	class InCommerceUpgrades extends kHelper {
+	class InCommerceUpgrades extends kUpgradeHelper {
 
-		/**
-		 * Install toolkit instance
-		 *
-		 * @var kInstallToolkit
-		 */
-		var $_toolkit = null;
-
-		/**
-		 * Sets common instance of installator toolkit
-		 *
-		 * @param kInstallToolkit $instance
-		 */
-		function setToolkit(&$instance)
+		function InCommerceUpgrades()
 		{
-			$this->_toolkit =& $instance;
+			parent::kHelper();
+
+			$this->dependencies = Array (
+				'4.3.9' => Array ('Core' => '4.3.9'),
+				'5.0.0' => Array ('Core' => '5.0.0'),
+				'5.0.1' => Array ('Core' => '5.0.1'),
+				'5.0.2-B1' => Array ('Core' => '5.0.2-B1'),
+				'5.0.2-B2' => Array ('Core' => '5.0.2-B2'),
+				'5.0.2-RC1' => Array ('Core' => '5.0.2-RC1'),
+				'5.0.2' => Array ('Core' => '5.0.2'),
+				'5.0.3-B1' => Array ('Core' => '5.0.3-B1'),
+				'5.0.3-B2' => Array ('Core' => '5.0.3-B2'),
+				'5.0.3-RC1' => Array ('Core' => '5.0.3-RC1'),
+				'5.0.3' => Array ('Core' => '5.0.3'),
+				'5.0.4-B1' => Array ('Core' => '5.0.4-B1'),
+				'5.0.4-B2' => Array ('Core' => '5.0.4-B2'),
+				'5.0.4' => Array ('Core' => '5.0.4'),
+				'5.1.0-B1' => Array ('Core' => '5.1.0-B1'),
+				'5.1.0-B2' => Array ('Core' => '5.1.0-B2'),
+				'5.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
+				'5.1.0' => Array ('Core' => '5.1.0'),
+			);
 		}
 
 		/**
@@ -101,9 +110,10 @@
 				$this->_updateDetailTemplate('p', 'in-commerce/designs/detail', 'in-commerce/products/product_detail');
 
 				// clean incomplete orders 5+ hours old
+				// don't use ORDER_STATUS_INCOMPLETE constant, since it's not available upgrade
 				$delete_timestamp = mktime() - (3600 * 5);
 				$sql = 'SELECT OrderId FROM ' . TABLE_PREFIX . 'Orders
-							WHERE Status = ' . ORDER_STATUS_INCOMPLETE . '
+							WHERE Status = ' . 0 . '
 							AND OrderDate < ' . $delete_timestamp;
 
 				$orders_to_delete = $this->Conn->GetCol($sql);
@@ -114,7 +124,7 @@
 											WHERE OrderId IN ( ' . implode(',', $orders_to_delete) . ' )' );
 
 					$this->Conn->Query( 'DELETE FROM ' . TABLE_PREFIX . 'Orders
-											WHERE Status = ' . ORDER_STATUS_INCOMPLETE . '
+											WHERE Status = ' . 0 . '
 											AND OrderDate < ' . $delete_timestamp );
 				}