Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 12, 2012 · 1fc4e7c · 1fc4e7c
2 parents d43c1de + 6557b71
commit 1fc4e7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - bug #3516341 [export] Open Document Text, Word and Texy! Text show table structure twice
 - bug [export] Texy! Text: Columns containing Pipe Character don't export properly
 + [export] Show triggers in Open Document Text, Word and Texy! Text
+- Patch #3415061 [auth] Login screen appears under the page
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
@@ -158,10 +158,6 @@ function PMA_auth()
     ?>
 <script type="text/javascript">
 //<![CDATA[
-// show login form in top frame
-if (top != self) {
-    window.top.location.href=location;
-}
 // reveal the login form to users with JS enabled
 $(document).ready(function () {
     $('form.login').show();
@@ -314,6 +310,14 @@ function PMA_auth()
         include CUSTOM_FOOTER_FILE;
     }
     ?>
+<script type="text/javascript">
+//<![CDATA[
+// show login form in top frame.
+if (top != self || document.body.className != 'loginform') {
+    window.top.location.href=location;
+}
+//]]>
+</script>
 </body>
 </html>
     <?php