Index: branches/5.2.x/units/gateways/gw_tag_processor.php
===================================================================
diff -u -N -r14625 -r14957
--- branches/5.2.x/units/gateways/gw_tag_processor.php	(.../gw_tag_processor.php)	(revision 14625)
+++ branches/5.2.x/units/gateways/gw_tag_processor.php	(.../gw_tag_processor.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gw_tag_processor.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: gw_tag_processor.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -43,15 +43,17 @@
 
 	function gwConfigValue($params)
 	{
-		$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
+
 		$id = $object->GetID();
 
 		$value = isset($this->ConfigValues[$id]) ? $this->ConfigValues[$id] : '';
-		if (!array_key_exists('no_special', $params) || !$params['no_special']) {
+		if ( !array_key_exists('no_special', $params) || !$params['no_special'] ) {
 			$value = htmlspecialchars($value);
 		}
 
-		if ( getArrayValue($params,'checked') ) {
+		if ( getArrayValue($params, 'checked') ) {
 			$value = ($value == 1) ? 'checked' : '';
 		}
 
Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r14702 -r14957
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 14702)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 14702 2011-10-26 11:43:10Z alex $
+* @version	$Id: product_option_combinations_event_handler.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -180,9 +180,18 @@
 		}
 	}
 
-	function OnUpdate(&$event)
+
+	/**
+	 * Updates kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnUpdate(kEvent &$event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
+		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		if($items_info)
Index: branches/5.2.x/units/addresses/addresses_tag_processor.php
===================================================================
diff -u -N -r14258 -r14957
--- branches/5.2.x/units/addresses/addresses_tag_processor.php	(.../addresses_tag_processor.php)	(revision 14258)
+++ branches/5.2.x/units/addresses/addresses_tag_processor.php	(.../addresses_tag_processor.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_tag_processor.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: addresses_tag_processor.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -14,11 +14,12 @@
 
 	class AddressesTagProcessor extends kDBTagProcessor {
 
-		function ListAddresses($params) {
+		function ListAddresses($params)
+		{
 			$ret = $this->PrintList2($params);
 
-			if (!$ret){
-				$block_params = array('name' => $params['empty_myaddresses_render_as']);
+			if ( !$ret ) {
+				$block_params = array ('name' => $params['empty_myaddresses_render_as']);
 				$ret = $this->Application->ParseBlock($block_params);
 			}
 
@@ -29,26 +30,29 @@
 		 * Print location using only filled in fields
 		 *
 		 * @param Array $params
-		 * @access public
+		 * @return string
+		 * @access protected
 		 */
-		function PrintLocation($params)
+		protected function PrintLocation($params)
 		{
-			$object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params);
+			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
 
-			$fields = Array('City','State','Zip','Country');
-
 			$ret = '';
-			foreach($fields as $field)
-			{
+			$fields = Array ('City', 'State', 'Zip', 'Country');
+
+			foreach ($fields as $field) {
 				$value = $object->GetField($field);
-				if ($field == 'Country' && $value) {
+				if ( $field == 'Country' && $value ) {
 					$ret .= '<br/>';
 				}
-				if ($value) {
-					$ret .= $value.', ';
+
+				if ( $value ) {
+					$ret .= $value . ', ';
 				}
 			}
-			return rtrim($ret,', ');
+
+			return rtrim($ret, ', ');
 		}
 
 		function EditLink($params)
@@ -73,17 +77,19 @@
 		function IsProfileAddress($params)
 		{
 			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
+
 			return $object->GetDBField('IsProfileAddress');
 		}
 
 		function BuildListSpecial($params)
 		{
-			if ($this->Special != '') {
+			if ( $this->Special != '' ) {
 				return $this->Special;
 			}
 
 			$list_unique_key = $this->getUniqueListKey($params);
-			if ($list_unique_key == '') {
+			if ( $list_unique_key == '' ) {
 				return parent::BuildListSpecial($params);
 			}
 
Index: branches/5.2.x/units/order_items/order_items_event_handler.php
===================================================================
diff -u -N -r14679 -r14957
--- branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 14679)
+++ branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_event_handler.php 14679 2011-10-19 08:38:22Z alex $
+* @version	$Id: order_items_event_handler.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -89,9 +89,10 @@
 		 * Only for "Items" tab in "Orders -> Order Edit" in Admin
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		protected function OnUpdate(&$event)
+		protected function OnUpdate(kEvent &$event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14918 -r14957
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14918)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14918 2011-12-27 11:48:35Z alex $
+* @version	$Id: orders_event_handler.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -716,11 +716,13 @@
 
 
 	/**
-	 * Enter description here...
+	 * Updates kDBItem
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnUpdate(&$event)
+	protected function OnUpdate(kEvent &$event)
 	{
 		$this->setBillingAddress($event);
 
Index: branches/5.2.x/units/products/products_tag_processor.php
===================================================================
diff -u -N -r14918 -r14957
--- branches/5.2.x/units/products/products_tag_processor.php	(.../products_tag_processor.php)	(revision 14918)
+++ branches/5.2.x/units/products/products_tag_processor.php	(.../products_tag_processor.php)	(revision 14957)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_tag_processor.php 14918 2011-12-27 11:48:35Z alex $
+* @version	$Id: products_tag_processor.php 14957 2011-12-30 10:49:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -498,29 +498,37 @@
 
 	function Available($params)
 	{
-		$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		if (!$object->GetDBField('InventoryStatus')) return true;
+		if ( !$object->GetDBField('InventoryStatus') ) {
+			return true;
+		}
 
 		$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
 
-		if ($object->GetDBField('InventoryStatus') == 2) {
+		if ( $object->GetDBField('InventoryStatus') == 2 ) {
 			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
-			$sql = 'SELECT SUM(IF(QtyInStock > '.$object->GetDBField('QtyInStockMin').', 1, 0))
-					FROM '.$poc_table.'
-					WHERE (ProductId = '.$object->GetID().') AND (Availability = 1)';
+			$sql = 'SELECT SUM(IF(QtyInStock > ' . $object->GetDBField('QtyInStockMin') . ', 1, 0))
+					FROM ' . $poc_table . '
+					WHERE (ProductId = ' . $object->GetID() . ') AND (Availability = 1)';
 			$stock_available = $this->Conn->GetOne($sql) > 0; // at least one option combination present
 		}
 		else {
-		$stock_available = $object->GetDBField('QtyInStock') > $object->GetDBField('QtyInStockMin');
+			$stock_available = $object->GetDBField('QtyInStock') > $object->GetDBField('QtyInStockMin');
 		}
 
 		$prod_backordering = $object->GetDBField('BackOrder');
 
-		if ($stock_available) return true;
+		if ( $stock_available ) {
+			return true;
+		}
 
 		// stock is NOT available:
-		if (!$backordering || $prod_backordering == 0) return false; // if backordering is generaly disabled or disabled for product (Never)
+		if ( !$backordering || $prod_backordering == 0 ) {
+			// if backordering is generaly disabled or disabled for product (Never)
+			return false;
+		}
 
 		// backordering enabled; (auto or always mode)
 		return true;