Index: branches/5.2.x/units/articles/articles_event_handler.php
===================================================================
diff -u -N -r14256 -r14627
--- branches/5.2.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 14256)
+++ branches/5.2.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 14627)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_event_handler.php 14256 2011-03-16 21:37:31Z alex $
+* @version	$Id: articles_event_handler.php 14627 2011-10-04 09:35:02Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -20,8 +20,11 @@
 		 * Filters out archived articles
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -414,8 +417,10 @@
 		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -427,8 +432,10 @@
 		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -496,20 +503,25 @@
 		 * Sets default expiration based on module setting
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreCreate(&$event)
+		protected function OnPreCreate(&$event)
 		{
 			parent::OnPreCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
-				$object =& $event->getObject();
+			if ( $event->status != kEvent::erSUCCESS ) {
+				return ;
+			}
 
-				$archive_days = $this->Application->ConfigValue('News_Archive');
-				if ($archive_days) {
-					$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
-					$object->SetDBField('EndOn_date', $expire_date);
-					$object->SetDBField('EndOn_time', $expire_date);
-				}
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$archive_days = $this->Application->ConfigValue('News_Archive');
+			if ( $archive_days ) {
+				$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
+				$object->SetDBField('EndOn_date', $expire_date);
+				$object->SetDBField('EndOn_time', $expire_date);
 			}
 		}