bug #1413880, page status not preserved on Refresh

This commit is contained in:
Marc Delisle
2006-03-04 12:48:46 +00:00
parent 47539b833e
commit 4b4305a20e
3 changed files with 10 additions and 2 deletions

View File

@@ -7,6 +7,8 @@ $Source$
2006-03-04 Marc Delisle <lem9@users.sourceforge.net>
* lang/swedish: Update, thanks to Björn T. Hallberg - bjornth.
* import.php, libraries/common.lib.php: bug #1413880, page status not
preserved on Refresh
2006-03-03 Michal Čihař <michal@cihar.com>
* libraries/Theme_Manager.class.php: Fix include path (bug #1442008).

View File

@@ -399,8 +399,13 @@ if (isset($my_die)) {
}
if ($go_sql) {
// Set pos to zero to possibly append limit
$pos = 0;
if (isset($_GET['pos'])) {
// comes from the Refresh link
$pos = $_GET['pos'];
} else {
// Set pos to zero to possibly append limit
$pos = 0;
}
require('./sql.php');
} else {
$active_page = $goto;

View File

@@ -1583,6 +1583,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
$refresh_link = 'import.php'
. $url_qpart
. '&amp;show_query=1'
. (isset($_GET['pos']) ? '&amp;pos=' . $_GET['pos'] : '')
. '&amp;sql_query=' . urlencode($local_query);
$refresh_link = ' [' . PMA_linkOrButton($refresh_link, $GLOBALS['strRefresh']) . ']';
} else {