The branch, master has been updated
via 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 (commit)
from d8324ec67aa51acf7eb53aae2dc2c36114434ea8 (commit)
- Log -----------------------------------------------------------------
commit 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Jul 26 17:31:56 2010 +0200
Fix back showing login form in frames.
-----------------------------------------------------------------------
Summary of changes:
libraries/auth/cookie.auth.lib.php | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index a964455..870ac56 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -172,13 +172,14 @@ function PMA_auth()
?>
<script src="./js/jquery/jquery-1.4.2.js"
type="text/javascript"></script>
<script src="./js/update-location.js"
type="text/javascript"></script>
-<?php
-if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
-?>
-<script src="./js/cross_framing_protection.js"
type="text/javascript"></script>
-<?php
+<script type="text/javascript">
+//<![CDATA[
+// show login form in top frame
+if (top != self) {
+ window.top.location.href=location;
}
-?>
+//]]>
+</script>
<script src="./js/functions.js"
type="text/javascript"></script>
</head>
hooks/post-receive
--
phpMyAdmin
Show replies by date