Index: branches/5.2.x/core/units/page_revisions/page_revision_eh.php
===================================================================
diff -u -N -r15165 -r16513
--- branches/5.2.x/core/units/page_revisions/page_revision_eh.php	(.../page_revision_eh.php)	(revision 15165)
+++ branches/5.2.x/core/units/page_revisions/page_revision_eh.php	(.../page_revision_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: page_revision_eh.php 15165 2012-03-09 10:24:24Z alex $
+* @version	$Id: page_revision_eh.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -33,8 +33,8 @@
 			return $this->Application->isAdminUser;
 		}
 
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		if ( $event->Name == 'OnSave' ) {
 				$perm_status = $this->Application->CheckPermission('CATEGORY.REVISION.ADD', 0) || $this->Application->CheckPermission('CATEGORY.REVISION.ADD.PENDING', 0);
@@ -62,8 +62,8 @@
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		$page_id = $event->getEventParam('page_id');
 
@@ -91,11 +91,11 @@
 	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'current' ) {
+			/** @var kDBItem $page */
 			$page = $this->Application->recallObject('st.-virtual');
-			/* @var $page kDBItem */
 
+			/** @var PageHelper $page_helper */
 			$page_helper = $this->Application->recallObject('PageHelper');
-			/* @var $page_helper PageHelper */
 
 			$page_id = $page->GetID();
 			$revision_clause = $page_helper->getRevsionWhereClause($page_id, $page->GetDBField('LiveRevisionNumber'));
@@ -111,8 +111,8 @@
 			}
 
 			// no revisions -> create live revision
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('PageId', $page_id);
 			$object->SetDBField('RevisionNumber', 1);
@@ -136,8 +136,8 @@
 	{
 		parent::OnBeforeItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $this->Application->isAdmin ) {
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
@@ -158,8 +158,8 @@
 	{
 		parent::OnBeforeItemUpdate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $object->GetDBField('IsDraft') == 0 && $object->GetOriginalField('IsDraft') == 1 ) {
 			$object->SetDBField('CreatedOn_date', adodb_mktime());
@@ -178,15 +178,15 @@
 	{
 		parent::OnAfterItemCreate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( !$object->GetDBField('FromRevisionId') ) {
 			return ;
 		}
 
+		/** @var kDBItem $content */
 		$content = $this->Application->recallObject('content.-item', null, Array ('skip_autoload' => true));
-		/* @var $content kDBItem */
 
 		$sql = 	$content->GetSelectSQL() . '
 				WHERE pr.RevisionId = ' . $object->GetDBField('FromRevisionId');
@@ -210,14 +210,14 @@
 	{
 		parent::OnAfterItemUpdate($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$status = $object->GetDBField('Status');
 
 		if ( $status != $object->GetOriginalField('Status') && $status == STATUS_ACTIVE ) {
+			/** @var kDBItem $page */
 			$page = $this->Application->recallObject('c.revision', null, Array ('skip_autoload' => true));
-			/* @var $page kDBItem */
 
 			$page->Load($object->GetDBField('PageId'));
 			$page->SetDBField('LiveRevisionNumber', $object->GetDBField('RevisionNumber'));
@@ -238,8 +238,8 @@
 			return ;
 		}
 
+		/** @var PageHelper $page_helper */
 		$page_helper = $this->Application->recallObject('PageHelper');
-		/* @var $page_helper PageHelper */
 
 		$page_id = $this->Application->GetVar('m_cat_id');
 		echo json_encode( $page_helper->getPageInfo($page_id) );
@@ -257,8 +257,8 @@
 		$revision_id = $this->getCurrentDraftRevision($event);
 
 		if ( $revision_id ) {
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->Load($revision_id);
 			$object->SetDBField('IsDraft', 0);
@@ -287,8 +287,8 @@
 		$revision_id = $this->getCurrentDraftRevision($event);
 
 		if ( $revision_id ) {
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($revision_id));
 		}
@@ -303,8 +303,8 @@
 	 */
 	function OnPublish($event)
 	{
+		/** @var kDBItem $revision */
 		$revision = $this->Application->recallObject('page-revision.current');
-		/* @var $revision kDBItem */
 
 		if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_ACTIVE || $revision->GetDBField('IsDraft') ) {
 			return ;
@@ -323,8 +323,8 @@
 	 */
 	function OnDecline($event)
 	{
+		/** @var kDBItem $revision */
 		$revision = $this->Application->recallObject('page-revision.current');
-		/* @var $revision kDBItem */
 
 		if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_DISABLED || $revision->GetDBField('IsLive') || $revision->GetDBField('IsDraft') ) {
 			return ;