From 2d1c29d3f8bbe5c21143a94171ca59c2c710eba1 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 18 Dec 2007 18:13:24 +0000
Subject: [PATCH] bug #1813508 [login] Missing parameter: field after re-login

---
 ChangeLog                          | 1 +
 libraries/auth/cookie.auth.lib.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fd34875eb..51061b676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
  (fix for sorting on column headers)
 - bug #1764182 [cookies] Suhosin cookie encryption breaks phpMyAdmin
 - bug #1798786 [import] Wrong error when a string contains semicolon
+- bug #1813508 [login] Missing parameter: field after re-login 
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 14282e867..bc4397aad 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -629,6 +629,10 @@ function PMA_auth_fails()
         // Remember where we got timeout to return on same place
         if (PMA_getenv('SCRIPT_NAME')) {
             $GLOBALS['target'] = basename(PMA_getenv('SCRIPT_NAME'));
+            // avoid "missing parameter: field" on re-entry
+            if ('tbl_alter.php' == $GLOBALS['target']) {
+                $GLOBALS['target'] = 'tbl_structure.php';
+            }
         }
     } elseif (PMA_DBI_getError()) {
         $conn_error = PMA_sanitize(PMA_DBI_getError());