Index: branches/5.2.x/core/units/country_states/country_state_eh.php
===================================================================
diff -u -N -r15145 -r16513
--- branches/5.2.x/core/units/country_states/country_state_eh.php	(.../country_state_eh.php)	(revision 15145)
+++ branches/5.2.x/core/units/country_states/country_state_eh.php	(.../country_state_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: country_state_eh.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: country_state_eh.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -46,12 +46,12 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( ($event->Special == 'selected') || ($event->Special == 'available') ) {
+				/** @var EditPickerHelper $edit_picker_helper */
 				$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
-				/* @var $edit_picker_helper EditPickerHelper */
 
 				$edit_picker_helper->applyFilter($event, 'Countries');
 
@@ -95,8 +95,8 @@
 		 */
 		function _setRequired($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('IsoCode');
 
@@ -123,11 +123,11 @@
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			if ( $cs_helper->CountryHasStates($object->GetDBField('IsoCode')) ) {
 				$event->status = kEvent::erFAIL;
@@ -146,8 +146,8 @@
 		{
 			$event->status = kEvent::erSTOP;
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$states = $cs_helper->getStates( (string)$this->Application->GetVar('country_iso') );
 			echo json_encode($states);