Index: core/admin_templates/catalog/advanced_view.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/catalog/advanced_view.tpl	(revision 15892)
+++ core/admin_templates/catalog/advanced_view.tpl	(revision )
@@ -130,7 +130,7 @@
 	var $menu_frame = getFrame('menu');
 	if (typeof $menu_frame.ShowStructure != 'undefined') {
 		<inp2:m_DefineElement name="structure_node"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
-		$menu_frame.ShowStructure('<inp2:adm_PrintSection escape="1" render_as="structure_node" section_name="in-portal:browse"/>', false);
+		$menu_frame.ShowStructure('<inp2:adm_PrintSection js_escape="1" render_as="structure_node" section_name="in-portal:browse"/>', false);
 	}
 
 	Application.setHook(
\ No newline at end of file
Index: core/admin_templates/catalog/catalog.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/catalog/catalog.tpl	(revision 15892)
+++ core/admin_templates/catalog/catalog.tpl	(revision )
@@ -290,7 +290,7 @@
 	var $menu_frame = getFrame('menu');
 	if (typeof $menu_frame.ShowStructure != 'undefined') {
 		<inp2:m_DefineElement name="structure_node"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
-		$menu_frame.ShowStructure('<inp2:adm_PrintSection escape="1" render_as="structure_node" section_name="in-portal:browse"/>', true);
+		$menu_frame.ShowStructure('<inp2:adm_PrintSection js_escape="1" render_as="structure_node" section_name="in-portal:browse"/>', true);
 	}
 
 	Application.setHook(
\ No newline at end of file
Index: core/units/admin/admin_tag_processor.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/admin/admin_tag_processor.php	(revision 15892)
+++ core/units/admin/admin_tag_processor.php	(revision )
@@ -91,6 +91,8 @@
 			$params['deep_level'] = $deep_level++;
 			$template = $section_data['url']['t'];
 			unset($section_data['url']['t']);
+			$section_data['url']['__URLENCODE__'] = 1;
+
 			$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
 			$ret .= $this->Application->ParseBlock( array_merge($params, $section_data) );
 			if (!isset($section_data['children'])) {
@@ -205,6 +207,7 @@
 
 			$url_params = $section_data['url'];
 			unset($url_params['t']);
+			$url_params['__URLENCODE__'] = 1;
 
 			$section_data['section_url'] = $this->Application->HREF($section_data['url']['t'], '', $url_params);
 			$ret = $this->Application->ParseBlock( array_merge($params, $section_data) );
@@ -283,6 +286,7 @@
 				// remove template, so it doesn't appear as additional parameter in url
 				$template = $section_data['url']['t'];
 				unset($section_data['url']['t']);
+				$section_data['url']['__URLENCODE__'] = 1;
 
 				$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
 
\ No newline at end of file