From b8da992112375740854c4cd2ced2b93bfb8bf467 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 12 Feb 2006 14:19:42 +0000
Subject: [PATCH] bug 1429074, go back to this page choice not sticky

---
 ChangeLog       |  2 ++
 tbl_change.php  | 16 +++++-----------
 tbl_replace.php |  3 +++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fcf291c98..fd4482164 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2006-02-12 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/english and hebrew: bug #1429769, typo
+    * tbl_change.php, tbl_replace.php: bug #1429074, "go back to this page"
+      choice should be sticky
 
 2006-02-10 Marc Delisle  <lem9@users.sourceforge.net>
     * .htaccess added to main directory for bug #1411996; at least on
diff --git a/tbl_change.php b/tbl_change.php
index b5c3fbe7e..90762f141 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -924,14 +924,8 @@ if (isset($primary_key)) {
     <?php
 echo "\n";
 
-// Defines whether "insert another new row" should be
-// selected or not (keep this choice sticky)
-if (!empty($disp_message)) {
-    $selected_after_insert_new_insert = ' selected="selected"';
-    $selected_after_insert_back = '';
-} else {
-    $selected_after_insert_back = ' selected="selected"';
-    $selected_after_insert_new_insert = '';
+if (!isset($after_insert)) {
+    $after_insert = 'back';
 }
 ?>
         </td>
@@ -940,12 +934,12 @@ if (!empty($disp_message)) {
         </td>
         <td valign="middle" nowrap="nowrap">
             <select name="after_insert">
-                <option value="back" <?php echo $selected_after_insert_back; ?>><?php echo $strAfterInsertBack; ?></option>
-                <option value="new_insert" <?php echo $selected_after_insert_new_insert; ?>><?php echo $strAfterInsertNewInsert; ?></option>
+                <option value="back" <?php echo ($after_insert == 'back' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertBack; ?></option>
+                <option value="new_insert" <?php echo ($after_insert == 'new_insert' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertNewInsert; ?></option>
 <?php
 if (isset($primary_key)) {
     ?>
-                <option value="same_insert"><?php echo $strAfterInsertSame; ?></option>
+                <option value="same_insert" <?php echo ($after_insert == 'same_insert' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertSame; ?></option>
     <?php
     // If we have just numeric primary key, we can also edit next
     if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $primary_key)) {
diff --git a/tbl_replace.php b/tbl_replace.php
index f67e44b9d..1323ccfa3 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -35,6 +35,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
           . '&dontlimitchars=' . $dontlimitchars
+          . '&after_insert=' . $after_insert
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
 } elseif (isset($after_insert) && $after_insert == 'same_insert') {
     $goto = 'tbl_change.php?'
@@ -45,6 +46,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
           . '&dontlimitchars=' . $dontlimitchars
+          . '&after_insert=' . $after_insert
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
     if (isset($primary_key)) {
         foreach ($primary_key AS $pk) {
@@ -60,6 +62,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
           . '&dontlimitchars=' . $dontlimitchars
+          . '&after_insert=' . $after_insert
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
     if (isset($primary_key)) {
         foreach ($primary_key AS $pk) {