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'));
 
 
Index: branches/5.3.x/admin_templates/articles/articles_edit.tpl
===================================================================
diff -u -N -r15901 -r16400
--- branches/5.3.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 15901)
+++ branches/5.3.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 16400)
@@ -68,10 +68,16 @@
 			<inp2:m_RenderElement name="inp_edit_codemirror" prefix="n" field="Body" title="la_fld_Body" control_options="{min_height: 100}" allow_html="1" language="text/html" display_original="1"/>
 
 			<!-- excerpt: begin -->
-			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
+			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" generate_field="GenerateExcerpt" title="la_fld_Excerpt">
 				<td class="control-cell">
 					<textarea tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:$prefix_Field field="$field"/></textarea><br />
-					<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
+
+					<input type="hidden" id="<inp2:{$prefix}_InputName field='$generate_field'/>" name="<inp2:{$prefix}_InputName field='$generate_field'/>" value="<inp2:{$prefix}_Field field='$generate_field' db='db'/>"/>
+
+					<label>
+						<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$generate_field'/>" <inp2:{$prefix}_Field field="$generate_field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$generate_field'/>'));"/>
+						<inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/>
+					</label>
 				</td>
 			</inp2:m_RenderElement>
 			<!-- excerpt: end -->
@@ -129,4 +135,4 @@
     }
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.3.x/units/articles/articles_config.php
===================================================================
diff -u -N -r16394 -r16400
--- branches/5.3.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 16394)
+++ branches/5.3.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 16400)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_config.php 16394 2016-11-11 20:15:37Z alex $
+* @version	$Id: articles_config.php 16400 2016-11-12 19:13:11Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -474,6 +474,11 @@
 		'LocalImage' => Array ('type' => 'string', 'default' => ''),
 		'LocalPath' => Array ('type' => 'string', 'default' => ''),
 		'FullUrl' => Array ('type' => 'string', 'default' => ''),
+		'GenerateExcerpt' => array(
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'default' => 0,
+		),
 
 		// export related fields: begin
 		'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),