Index: branches/5.3.x/units/articles/articles_event_handler.php
===================================================================
diff -u -N -r16108 -r16400
--- branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 16108)
+++ branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 16400)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_event_handler.php 16108 2014-12-07 11:47:37Z alex $
+* @version	$Id: articles_event_handler.php 16400 2016-11-12 19:13:11Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -214,10 +214,6 @@
 				return false;
 			}
 
-			$category_id = $event->getEventParam('category_id');
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-			$this->Application->SetVar('m_cat_id', $category_id);
-
 			switch ($feed_type) {
 				case 'rss_2.0':
 					$this->parseRssFeed($article_node, $event);
@@ -227,8 +223,6 @@
 					$this->parseAtomFeed($article_node, $event);
 					break;
 			}
-
-			$this->Application->SetVar('m_cat_id', $backup_category_id);
 		}
 
 		/**
@@ -273,6 +267,7 @@
 			$object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
 			/* @var $object kDBItem */
 
+			$category_id = $event->getEventParam('category_id');
 			list ($title_field, $body_field) = $this->_getMLFields($object);
 
 			do {
@@ -302,6 +297,7 @@
 					$object->Clear();
 				}
 
+				$object->SetDBField('CategoryId', $category_id);
 				$object->SetDBField($title_field, $data['TITLE']);
 				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
 				$object->SetDBField('cust_RssArticleCRC', $article_crc);
@@ -361,6 +357,7 @@
 			$object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
 			/* @var $object kDBItem */
 
+			$category_id = $event->getEventParam('category_id');
 			list ($title_field, $body_field) = $this->_getMLFields($object);
 
 			do {
@@ -394,6 +391,7 @@
 					$object->Clear();
 				}
 
+				$object->SetDBField('CategoryId', $category_id);
 				$object->SetDBField($title_field, $data['TITLE']);
 				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
 				$object->SetDBField('cust_RssArticleCRC', $article_crc);
@@ -463,7 +461,7 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			if ( !$object->GetField('Excerpt') || $this->Application->GetVar('generate_excerpt') ) {
+			if ( !$object->GetField('Excerpt') || $object->GetDBField('GenerateExcerpt') ) {
 				$excerpt = strip_tags($object->GetField('Body'));