Index: branches/5.2.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -r14965 -r15267
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 14965)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 15267)
@@ -125,7 +125,7 @@
 
 			<b><inp2:conf_CategoryPath separator=" &gt; " render_as="category_caption" /></b>
 			<input type="hidden" name="conf[ModuleRootCategory][VariableValue]" value="<inp2:conf_ModuleRootCategory/>"/>
-			<a href="javascript:openSelector('conf', '<inp2:adm_SelectorLink prefix="conf" selection_mode="single" tab_prefixes="none"/>', 'ModuleRootCategory', '950x600');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
+			<a href="<inp2:adm_SelectorLink prefix='conf' selection_mode='single' tab_prefixes='none'/>" onclick="openSelector('conf', this.href, 'ModuleRootCategory', '950x600'); return false;"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 		</td>
 		<td class="error">&nbsp;</td>
 	</tr>
Index: branches/5.2.x/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r14244 -r15267
--- branches/5.2.x/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 15267)
@@ -93,7 +93,7 @@
 		<inp2:m_RenderElement name="permission_element" section_name="$section_name" perm_name="delete"/>
 		<td>
 			<inp2:m_if check="g-perm_HasAdvancedPermissions" section_name="$section_name">
-				<a href="javascript:openSelector('g-perm', '<inp2:m_t t="groups/permissions_selector" pass="all,g-perm" section_name="$section_name" escape="1"/>', 'PermList', null, 'OnGroupSavePermissions');"><inp2:m_phrase name="la_btn_Change"/></a>
+				<a href="<inp2:m_t t='groups/permissions_selector' pass='all,g-perm' section_name='$section_name'/>" onclick="openSelector('g-perm', this.href, 'PermList', null, 'OnGroupSavePermissions'); return false;"><inp2:m_phrase name="la_btn_Change"/></a>
 			<inp2:m_else/>
 				&nbsp;
 			</inp2:m_if>
Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r14718 -r15267
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14718)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 15267)
@@ -317,7 +317,7 @@
 		onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
 			</td>
 			<td valign="middle">
-				<a href="javascript:openSelector('<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_t t="$selector_template" pass="all,$PrefixSpecial" escape="1"/>', '<inp2:m_param name="filter_field"/>');">
+				<a href="<inp2:m_t t="$selector_template" pass="all,$PrefixSpecial"/>" onclick="openSelector('<inp2:m_Param name="PrefixSpecial" js_escape="1"/>', this.href, '<inp2:m_Param name="filter_field" js_escape="1"/>'); return false;">
 					<img src="img/icons/icon24_link_user.gif" style="cursor:hand;" width="24" height="24" border="0">
 				</a>
 			</td>
Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r15252 -r15267
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15252)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15267)
@@ -598,7 +598,7 @@
 			<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
 				<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');">
 			<inp2:m_else/>
-				<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:m_t t='user_selector' pass='all,$prefix' escape='1'/>', '<inp2:m_param name='field'/>');">
+				<a href="<inp2:m_t t='user_selector' pass='all,$prefix'/>" onclick="openSelector('<inp2:m_param name='prefix' js_escape='1'/>', this.href, '<inp2:m_param name='field' js_escape='1'/>'); return false;">
 			</inp2:m_if>
           		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
          	</a>
@@ -628,7 +628,7 @@
 					</td>
 					<td valign="middle">
 						<img src="img/spacer.gif" width="3" height="1" alt=""/>
-						<a href="javascript:openSelector('<inp2:m_param name='prefix'/>', '<inp2:adm_SelectorLink prefix='$prefix' selection_mode='single' tab_prefixes='none'/>', '<inp2:m_param name='field'/>');">
+						<a href="<inp2:adm_SelectorLink prefix='$prefix' selection_mode='single' tab_prefixes='none'/>" onclick="openSelector('<inp2:m_param name='prefix' js_escape='1'/>', this.href, '<inp2:m_param name='field' js_escape='1'/>'); return false;">
 			          		 <img src="img/icons/icon24_cat.gif" width="24" height="24" border="0"/>
 			         	</a>