nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1413880, page status not preserved on Refresh

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2006-03-04 Marc Delisle <lem9@users.sourceforge.net> 2006-03-04 Marc Delisle <lem9@users.sourceforge.net>
* lang/swedish: Update, thanks to Björn T. Hallberg - bjornth. * 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> 2006-03-03 Michal Čihař <michal@cihar.com>
* libraries/Theme_Manager.class.php: Fix include path (bug #1442008). * libraries/Theme_Manager.class.php: Fix include path (bug #1442008).

9
import.php
View File

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

1
libraries/common.lib.php
View File

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