Index: branches/RC/core/admin_templates/popups/editor.tpl
===================================================================
diff -u -N -r11056 -r11482
--- branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11056)
+++ branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11482)
@@ -18,7 +18,7 @@
 							}
 						) );
 					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-								window.close();
+								window_close();
 							}
 					 	) );
 
@@ -36,17 +36,19 @@
 	<tr><td style="padding: 0px">
 		<script type="text/javascript">
 			var $TargetField = '<inp2:m_Get var="TargetField"/>';
-			
+
 			function FCKeditor_OnComplete( editorInstance )
 			{
-				if (window.opener && !window.opener.closed)
-				{
-					current = window.opener.document.getElementById($TargetField).value;
+				var $opener = getWindowOpener(window);
+
+				if ($opener && !$opener.closed) {
+					current = $opener.document.getElementById($TargetField).value;
 					editorInstance.SetHTML(current);
 				}
 				else {
-					window.close()
+					window_close();
 				}
+
 				Form.Resize();
 			}
 
@@ -58,15 +60,21 @@
 						d.form.onsubmit()
 					}
 				}
-		
-				if (!window.opener) return;
-				if (!window.opener.closed) {
-					current = window.opener.document.getElementById($TargetField);
+
+				var $opener = getWindowOpener(window);
+
+				if (!$opener) {
+					return;
+				}
+
+				if (!$opener.closed) {
+					current = $opener.document.getElementById($TargetField);
 					current.value = document.getElementById('Content').value;
 				}
-				window.close();
+
+				window_close();
 			}
-		
+
 		</script>
 		<form name="frm" id="frm" action="javascript:update_opener();">
 			<inp2:adm_FCKEditor name="Content" width="100%" height="100" late_load="1"/>