Index: branches/5.2.x/core/admin_templates/incs/close_popup.tpl =================================================================== diff -u -N -r15445 -r16249 --- branches/5.2.x/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 15445) +++ branches/5.2.x/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 16249) @@ -69,10 +69,16 @@ } var $frameset = $main_window.parent.frames; + for ($i = 0; $i < $frameset.length; $i++) { - if ($frameset[$i].name == $name) { - return $frameset[$i]; - } + try { + if ($frameset[$i].name == $name) { + return $frameset[$i]; + } + } + catch ( e ) { + // Foreign domain frame detected. + } } return $main_window.parent; } @@ -107,4 +113,4 @@ - \ No newline at end of file + Index: branches/5.2.x/core/admin_templates/js/script.js =================================================================== diff -u -N -r15905 -r16249 --- branches/5.2.x/core/admin_templates/js/script.js (.../script.js) (revision 15905) +++ branches/5.2.x/core/admin_templates/js/script.js (.../script.js) (revision 16249) @@ -1436,9 +1436,14 @@ var $frameset = $main_window.parent.frames; for ($i = 0; $i < $frameset.length; $i++) { - if ( $frameset[$i].name == $name ) { - return $frameset[$i]; + try { + if ($frameset[$i].name == $name) { + return $frameset[$i]; + } } + catch ( e ) { + // Foreign domain frame detected. + } } return $main_window.parent; @@ -1942,4 +1947,4 @@ }, 1000); } ); -} \ No newline at end of file +}