Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14892 -r14916
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14892)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14916)
@@ -534,18 +534,13 @@
 <inp2:m_DefineElement name="inp_edit_category" class="" size="" old_style="0" onkeyup="">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
+			<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
+
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td id="<inp2:{$prefix}_InputName field='$field'/>_path"<inp2:m_ifnot check="Field" name="$field" db="db"> style="display: none;"</inp2:m_ifnot>>
-						<inp2:m_DefineElement name="category_caption">
-							<inp2:m_ifnot check="m_Param" name="is_first">
-								<inp2:m_param name="separator"/>
-							</inp2:m_ifnot>
-							<inp2:m_param name="cat_name"/>
-						</inp2:m_DefineElement>
-
-						<inp2:$prefix_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
-						<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
+						<inp2:$prefix_Field field='$field' db="db" result_to_var="category_id"/>
+						<inp2:m_include template="categories/category_path" category_id="$category_id"/>
 					</td>
 					<td valign="middle">
 						<img src="img/spacer.gif" width="3" height="1" alt=""/>
@@ -556,27 +551,39 @@
 			         	<a href="#" id="<inp2:{$prefix}_InputName field='$field'/>_disable_link"<inp2:m_ifnot check="Field" name="$field" db="db"> style="display: none;"</inp2:m_ifnot>><inp2:m_Phrase name="la_Text_Disable"/></a>
 
 			         	<script type="text/javascript">
+							function processItemSelector($field, $selector) {
+								var $item_ids = $selector.Grids['c'].GetSelected();
+
+								CategorySelector.setCategory($field, $item_ids.length ? $item_ids.shift() : '');
+							}
+
 							function CategorySelector() {
 							}
 
 							CategorySelector.getField = function ($field) {
 								return jq('<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field));
 							}
 
-							CategorySelector.disableCategory = function ($field) {
+							CategorySelector.setCategory = function ($field, $category_id) {
 								var $field_id = this.getField($field);
 
-				         		$('#' + $field_id).val('');
-				         		$('#' + $field_id + '_path, #' + $field_id + '_disable_link').hide();
+				         		$('#' + $field_id).val($category_id);
+
+								$('#' + $field_id + '_path').load(
+									'<inp2:m_Link template="categories/category_path" category_id="#ID#" no_amp="1" js_escape="1"/>'.replace('#ID#', $category_id),
+									function () {
+										$('#' + $field_id + '_path, #' + $field_id + '_disable_link').toggle( $category_id !== '' );
+									}
+								);
 							}
 
-			         		$(document).ready(
+							$(document).ready(
 								function() {
 									var $field_id = CategorySelector.getField('<inp2:m_Param name="field" js_escape="1"/>');
 
 									$('#' + $field_id + '_disable_link').click(
 										function ($e) {
-											CategorySelector.disableCategory('<inp2:m_Param name="field" js_escape="1"/>');
+											CategorySelector.setCategory('<inp2:m_Param name="field" js_escape="1"/>', '');
 
 											return false;
 										}