mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-03 17:22:20 +09:00
IE6/7에서 HTTP페이지에서의 HTTPS 요청시 새창이 뜨던 문제 수정
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6776 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
f0251ba21e
commit
e43991462e
2 changed files with 8 additions and 3 deletions
|
|
@ -81,6 +81,11 @@
|
||||||
$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
|
$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
|
||||||
|
|
||||||
if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
|
if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
|
||||||
|
|
||||||
|
|
||||||
|
if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get("_use_ssl")=='optional'||Context::get("_use_ssl")=="always")) {
|
||||||
|
Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<body>
|
<body>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var idx = location.href.indexOf('?');
|
var idx = location.href.indexOf('?');
|
||||||
var url = top.location.href;
|
var url = parent.location.href;
|
||||||
if(idx > -1 ) {
|
if(idx > -1 ) {
|
||||||
var query_string = location.href.substr(idx+1, location.href.length);
|
var query_string = location.href.substr(idx+1, location.href.length);
|
||||||
var args = {};
|
var args = {};
|
||||||
|
|
@ -17,9 +17,9 @@
|
||||||
}
|
}
|
||||||
if(typeof(opener)!='undefined' && opener) {
|
if(typeof(opener)!='undefined' && opener) {
|
||||||
opener.location.href = url;
|
opener.location.href = url;
|
||||||
window.close();
|
self.close();
|
||||||
} else {
|
} else {
|
||||||
top.location.href = url;
|
parent.location.href = url;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue