Index: branches/RC/core/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r11623 -r11931
--- branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 11931)
@@ -50,6 +50,7 @@
 TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
+var $modal_windows = <inp2:m_if check="m_GetConfig" name="UseModalWindows">true<inp2:m_else/>false</inp2:m_if>;
 var multiple_windows = '1';
 var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
 var tpl_changed = 0;
@@ -67,7 +68,10 @@
 <inp2:m_if check="m_GetEquals" name="m_wid" value="" inverse="inverse">
 	if (!window.name.match(/_<inp2:m_get name="m_wid"/>$/)) {
 		window.name += '_<inp2:m_get name="m_wid"/>'; // change window name only once per window
-		getFrame('main').TB.setWindowMetaData('window_name', window.name); // used to simulate window.opener functionality
+
+		if ($modal_windows) {
+			getFrame('main').TB.setWindowMetaData('window_name', window.name); // used to simulate window.opener functionality
+		}
 	}
 </inp2:m_if>