From 2277454f1e8b2cf6a0ea22dcbaddd8ceaf89d455 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 29 Nov 2002 11:35:21 +0000
Subject: [PATCH] bug 645173

---
 ChangeLog                      | 4 ++++
 tbl_change.php3                | 6 ++++--
 tbl_properties_operations.php3 | 2 +-
 tbl_select.php3                | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca42f6b65d..7bc9147cdd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-11-29 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php3, tbl_select.php3, tbl_properties_operations.php3:
+      bug 645173 wrong back link for inserts
+
 2002-11-28 Marc Delisle  <lem9@users.sourceforge.net>
     * main.php3: display PHP 4.2.3 warning only if mbstring is loaded
 
diff --git a/tbl_change.php3 b/tbl_change.php3
index 84a9f0c0b1..808cb57517 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -62,7 +62,8 @@ if (get_magic_quotes_gpc()) {
 if (!isset($goto)) {
     $goto    = 'db_details.php3';
 }
-if ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3') {
+//if ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3') {
+if (!ereg('^(db_details|tbl_properties|tbl_select)', $goto)) {
     $err_url = $goto;
 } else {
     $err_url = $goto
@@ -70,7 +71,8 @@ if ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3') {
              . '&amp;convcharset=' . $convcharset
              . '&amp;server=' . $server
              . '&amp;db=' . urlencode($db)
-             . (($goto == 'tbl_properties.php3') ? '&amp;table=' . urlencode($table) : '');
+             //. (($goto == 'tbl_properties.php3') ? '&amp;table=' . urlencode($table) : '');
+             . ((ereg('^(tbl_properties|tbl_select)', $goto)) ? '&amp;table=' . urlencode($table) : '');
 }
 
 
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php3
index 42028f9639..c41b7b0691 100755
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php3
@@ -7,7 +7,7 @@
  * Runs common work
  */
 require('./tbl_properties_common.php3');
-$err_url   = 'tbl_properties_operations.php3' . $err_url;
+//$err_url   = 'tbl_properties_operations.php3' . $err_url;
 $url_query .= '&amp;goto=tbl_properties_operations.php3&amp;back=tbl_properties_operations.php3';
 
 
diff --git a/tbl_select.php3 b/tbl_select.php3
index 68024dc1b8..ae28fc99e2 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -25,10 +25,13 @@ $textfunctions = array('LIKE', '=', '!=');
 if (!isset($param) || $param[0] == '') {
     // Gets some core libraries
     include('./tbl_properties_common.php3');
-    $err_url   = 'tbl_select.php3' . $err_url;
+    //$err_url   = 'tbl_select.php3' . $err_url;
     $url_query .= '&amp;goto=tbl_select.php3&amp;back=tbl_select.php3';
     include('./tbl_properties_table_info.php3');
 
+    if (!isset($goto)) {
+        $goto = $cfg['DefaultTabTable'];
+    }
     // Defines the url to return to in case of error in the next sql statement
     $err_url   = $goto
                . '?lang=' . $lang
-- 
2.11.4.GIT