Index: branches/5.2.x/admin_templates/links/links_categories.tpl
===================================================================
--- branches/5.2.x/admin_templates/links/links_categories.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/links/links_categories.tpl	(revision 16342)
@@ -1,84 +1,84 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="links_categories" tab_preset="Default" pagination="1" pagination_prefix="l-ci"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
   				function edit(){ }
 
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('l','<inp2:l_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('l','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('l', '<inp2:l_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('l', '<inp2:l_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Category related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('l', '<inp2:adm_SelectorLink prefix="l" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
+							openSelector('l', '<inp2:adm_SelectorLink prefix="l" selection_mode="multi" tab_prefixes="none" no_amp="1" js_escape="1"/>', 'ItemCategory');
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('l-ci')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('l-ci','OnSetPrimary');
 						}
 				 ) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="l_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
 					<inp2:m_if check="l_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="l_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="l-ci" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_DefineElement name="grid_checkbox_category_td">
 	<inp2:CategoryName field="$field" primary_title="la_PrimaryCategory" no_special="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="l-ci" IdField="CategoryId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-ci'].SetDependantToolbarButtons( new Array('delete','setprimary') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/links/links_relations.tpl
===================================================================
--- branches/5.2.x/admin_templates/links/links_relations.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/links/links_relations.tpl	(revision 16342)
@@ -1,105 +1,105 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="links_relations" tab_preset="Default" pagination="1" pagination_prefix="l-rel"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('l','<inp2:l_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('l','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('l', '<inp2:l_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('l', '<inp2:l_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('l-rel', '<inp2:adm_SelectorLink prefix="l-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
+							openSelector('l-rel', '<inp2:adm_SelectorLink prefix="l-rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
 	  			{
 	  				std_edit_temp_item('l-rel', 'in-link/links/relations_edit');
 	  			}
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('l-rel')
 						} ) );
 
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('l-rel','OnMassApprove');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('l-rel','OnMassDecline');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="l_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="l_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="l_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="l-rel" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="l-rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['l-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
 <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
 <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
 	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
 </script>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/export_progress.tpl
===================================================================
--- branches/5.2.x/admin_templates/export_progress.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/export_progress.tpl	(revision 16342)
@@ -1,14 +1,14 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="l.export" section="in-portal:browse" perm_section="LINK" permission_type="VIEW" system_permission="0" title_preset="links_export"/>
 
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 
 <script type="text/javascript">
 	function cancel_action() {
 		submit_event('l.export', 'OnExportCancel');
 	}
 
-	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" l.export_event="OnExportProgress" pass="m,l.export" js_escape="1"/>');
+	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" l.export_event="OnExportProgress" pass="m,l.export" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/link_validation/link_validation_progress.tpl
===================================================================
--- branches/5.2.x/admin_templates/link_validation/link_validation_progress.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/link_validation/link_validation_progress.tpl	(revision 16342)
@@ -1,14 +1,14 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-link:link_validation" prefix="link-validation" title_preset="link_validation_progress"/>
 
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 
 <script type="text/javascript">
 	function cancel_action() {
 		submit_event('link-validation', 'OnCancelValidation', 'in-link/link_validation/link_validation_list');
 	}
 
-	$LinkValidation = new AjaxProgressBar('<inp2:m_Link template="dummy" link-validation_event="OnValidateProgress" pass="m,link-validation" finish_template="in-link/link_validation/link_validation_list" no_amp="1"/>');
+	$LinkValidation = new AjaxProgressBar('<inp2:m_Link template="dummy" link-validation_event="OnValidateProgress" pass="m,link-validation" finish_template="in-link/link_validation/link_validation_list" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/import.tpl
===================================================================
--- branches/5.2.x/admin_templates/import.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/import.tpl	(revision 16342)
@@ -1,221 +1,221 @@
 <inp2:adm_SetPopupSize width="780" height="670"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:l.import_PresetFormFields/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						location.href = '<inp2:m_Link t="tools/import2"/>';
+						location.href = '<inp2:m_Link t="tools/import2" no_amp="1" js_escape="1"/>';
 					}
 				) );
 
 				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
 
 						document.getElementById('export_columns').value = select_to_string('<inp2:l.import_InputName field="ExportColumns"/>');
 						submit_event('l.import','OnExportBegin');
 
 						}
 					) );
 
 				a_toolbar.Render();
 
 				function check_radio($id)
 				{
 					document.getElementById($id).checked = true;
 				}
 
 				// gets value of checked radio button
 				function get_checked($field_name) {
 					var $ret = false;
 					var $fields = document.getElementsByName($field_name);
 
 					for(var $i = 0; $i < $fields.length; $i++) {
 						if ($fields[$i].checked) {
 							$ret = $fields[$i].value;
 							break;
 						}
 					}
 					return $ret;
 				}
 
 				// enable/disable form fields based on other field values
 				function reflectFormFields()
 				{
 					var $auto_fields = get_checked('<inp2:l.import_InputName field="FieldTitles"/>') == 1 ? true : false;
 
 					if ($auto_fields) {
 						document.getElementById('_cb_<inp2:l.import_InputName field="SkipFirstRow"/>').checked = true;
 					}
 					document.getElementById('_cb_<inp2:l.import_InputName field="SkipFirstRow"/>').onchange();
 					document.getElementById('<inp2:l.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
 					document.getElementById('<inp2:l.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;
 
 					var $btn = null;
 					var $btns = Array('up', 'down', 'left', 'right');
 					var $i = 0;
 					while ($i < $btns.length) {
 						$btn = document.getElementById('btn_move_'+$btns[$i]);
 						$btn.disabled = $auto_fields;
 						$btn.className = $auto_fields ? 'button-disabled' : 'button';
 						$i++;
 					}
 				}
 
 				Application.setHook('l.import:OnBeforeOpenSelector',
 					function() {
 						document.getElementById('export_columns').value = select_to_string('<inp2:l.import_InputName field="ExportColumns"/>');
 					}
 				);
 
 				$(document).ready(
 					function() {
 						$('#step_number').text(3);
 					}
 				);
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
 <inp2:l.import_SaveWarning name="grid_save_warning"/>
 <inp2:l.import_ErrorWarning name="form_error_warning"/>
 
 <table class="edit-form bordered">
 	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 		<inp2:m_RenderElement design="form_row" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename">
 			<td class="control-cell">
 				<table border="0">
 					<tr>
 						<td>
 							<input type="radio" name="<inp2:l.import_InputName field="ImportSource"/>" id="<inp2:l.import_InputName field="ImportSource"/>_1"<inp2:m_if check="l.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
 						</td>
 						<td>
 							<label for="<inp2:l.import_InputName field="ImportSource"/>_1">upload</label>
 						</td>
 						<td>
 							<input type="file" name="<inp2:l.import_InputName field="ImportFilename"/>" id="<inp2:l.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:l.import_InputName field="ImportSource"/>_1');">
 						</td>
 					</tr>
 
 					<tr>
 						<td>
 							<input type="radio" name="<inp2:l.import_InputName field="ImportSource"/>" id="<inp2:l.import_InputName field="ImportSource"/>_2"<inp2:m_if check="l.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
 						</td>
 						<td>
 							<label for="<inp2:l.import_InputName field="ImportSource"/>_2">select</label>
 						</td>
 						<td>
 							<select name="<inp2:l.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:l.import_InputName field="ImportSource"/>_2');">
 								<inp2:l.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
 							</select>
 						</td>
 					</tr>
 
 				</table>
 			</td>
 		</inp2:m_RenderElement>
 
 		<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
 		<inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
 
 		<inp2:m_RenderElement design="form_row" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns">
 			<td class="control-cell">
 				<table cellpadding="0" cellspacing="0" border="0">
 					<tr>
 						<td>
 							<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:l.import_InputName field="ExportColumns"/>', 1)" class="button">
 							<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:l.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
 							<img src="img/spacer.gif" width="1" height="5" alt=""><br />
 						</td>
 						<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
 						<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
 					</tr>
 					<tr>
 						<td>
 							<select multiple id="<inp2:l.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
 								<inp2:l.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
 							</select>
 							<input type="hidden" id="export_columns" name="<inp2:l.import_InputName field="ExportColumns"/>" value="<inp2:l.import_Field field="ExportColumns"/>" />
 						</td>
 						<td align="center">
 							<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:l.import_InputName field="AvailableColumns"/>', '<inp2:l.import_InputName field="ExportColumns"/>')" class="button"><br>
 							<img src="img/spacer.gif" width="1" height="4" alt=""><br>
 							<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:l.import_InputName field="ExportColumns"/>', '<inp2:l.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:l.import_InputName field="AvailableColumns"/>');" class="button">
 						</td>
 						<td>
 							<select multiple id="<inp2:l.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
 								<inp2:l.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
 							</select>
 						</td>
 					</tr>
 				</table>
 			</td>
 		</inp2:m_RenderElement>
 
 <!-- CATEGORY SELECTOR: BEGIN -->
 	<inp2:m_DefineElement name="root_cat_caption">
 		<inp2:m_Phrase name="la_rootcategory_name"/>
 	</inp2:m_DefineElement>
 
 	<inp2:m_DefineElement name="category_caption">
 		<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
 	</inp2:m_DefineElement>
 
 	<inp2:m_RenderElement design="form_row" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory">
 		<td class="control-cell">
 			<b><inp2:l.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
 			<input type="hidden" name="<inp2:l.import_InputName field='CategoryId'/>" value="<inp2:l.import_Field field='CategoryId' db='db'/>" />
 			<a href="<inp2:adm_SelectorLink prefix='l.import' selection_mode='single' tab_prefixes='none'/>" onclick="openSelector('l.import', this.href, 'ImportCategory', null, 'OnSaveSettings'); return false;"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 		</td>
 	</inp2:m_RenderElement>
 <!-- CATEGORY SELECTOR: END -->
 
 	<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
 	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
 
 	<inp2:m_RenderElement design="form_row" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
 		<td class="control-cell">
 			<table cellspacing="0" cellpadding="0">
 				<tr>
 					<td valign="top">
 						<input type="radio"<inp2:m_if check="l.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
 					</td>
 					<td>
 						<label for="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: LINKID</label>
 					</td>
 				</tr>
 
 				<tr>
 					<td valign="top">
 						<input type="radio"<inp2:m_if check="l.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
 					</td>
 					<td>
 						<label for="<inp2:l.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
 						<inp2:l.import_PredefinedOptions prefix="l.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
 
 						<inp2:m_RenderElement prefix="l.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
 					</td>
 				</tr>
 			</table>
 		</td>
 	</inp2:m_RenderElement>
 
 	<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 
 <script language="javascript" type="text/javascript">
 	reflectFormFields();
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl
===================================================================
--- branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/paid_listings/paid_listing_edit.tpl	(revision 16342)
@@ -1,111 +1,111 @@
 <inp2:adm_SetPopupSize width="750" height="400"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="ls" section="in-link:paid_listings" title_preset="listing_edit"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 						submit_event('ls','<inp2:ls_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 						submit_event('ls','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('ls', '<inp2:ls_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('ls', '<inp2:ls_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="ls_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="ls_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="ls_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
 <inp2:ls_SaveWarning name="grid_save_warning"/>
 <inp2:ls_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_Text_PaidListing"/>
 			<inp2:m_RenderElement name="inp_label" prefix="ls" field="ListingId" title="la_fld_ListingId"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="ls" field="ListingTypeId" title="la_fld_ListingType" onchange="set_exp_date()" />
 
 			<inp2:m_RenderElement design="form_row" prefix="ls" field="LinkName" title="la_fld_LinkName">
 				<td class="control-cell">
 					<inp2:ls_Field name="LinkName" />
 					<a href="javascript:select_link();"><img src="<inp2:m_TemplatesBase module='in-link'/>/img/link_arrow.gif" border="0"></a>
 				</td>
 			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="ls" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ls" field="PendingRenewal" title="la_fld_PendingRenewal"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="ls" field="PurchasedOn" title="la_fld_PurchasedOn"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="ls" field="ExpiresOn" title="la_fld_ExpiresOn"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
 <script type="text/javascript">
 	function select_link()
 	{
-		openSelector('ls', '<inp2:adm_SelectorLink prefix="ls" selection_mode="single" tab_prefixes="l"/>', 'ItemResourceId', null, 'OnPreSaveListing');
+		openSelector('ls', '<inp2:adm_SelectorLink prefix="ls" selection_mode="single" tab_prefixes="l" no_amp="1" js_escape="1"/>', 'ItemResourceId', null, 'OnPreSaveListing');
 	}
 
 	function set_exp_date()
 	{
 		exp_date = exp_dates[document.getElementById('<inp2:ls_InputName field="ListingTypeId" />').value];
 		exp_time = exp_times[document.getElementById('<inp2:ls_InputName field="ListingTypeId" />').value];
 		if (typeof(exp_date) != 'undefined') {
 		document.getElementById('<inp2:ls_InputName field="ExpiresOn_date" />').value = exp_date;
 		document.getElementById('<inp2:ls_InputName field="ExpiresOn_time" />').value = exp_time;
 		}
 	}
 
 	var exp_dates = new Array();
 	var exp_times = new Array();
 	<inp2:m_DefineElement name="exp_date_elem" >
 		exp_dates[<inp2:Field name="ListingTypeId" />] = "<inp2:ls_ExpirationDate />";
 		exp_times[<inp2:Field name="ListingTypeId" />] = "<inp2:ls_ExpirationTime />";
 	</inp2:m_DefineElement>
 	<inp2:lst_PrintList block="exp_date_elem" />
 
 	<inp2:m_if check="m_getequals" param="ls_event" value="OnPreCreate">
 		set_exp_date();
 	</inp2:m_if>
 </script>
 
 <input type="hidden" name="main_prefix" id="main_prefix" value="ls">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/import_progress.tpl
===================================================================
--- branches/5.2.x/admin_templates/import_progress.tpl	(revision 16341)
+++ branches/5.2.x/admin_templates/import_progress.tpl	(revision 16342)
@@ -1,14 +1,14 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="l.import" section="in-portal:browse" perm_section="LINK" permission_type="VIEW" system_permission="0" title_preset="links_import"/>
 
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 
 <script type="text/javascript">
 	function cancel_action() {
 		submit_event('l.import', 'OnExportCancel');
 	}
 
-	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" l.import_event="OnExportProgress" pass="m,l.import" js_escape="1"/>');
+	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" l.import_event="OnExportProgress" pass="m,l.import" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.2.x
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /modules/in-link/branches/5.3.x:r15972