From 618cb07b264457d424e0fc35bd106f87b2d79172 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 5 Jan 2008 15:12:30 +0000 Subject: [PATCH] should go to ['userconf'] --- libraries/common.lib.php | 2 +- libraries/db_info.inc.php | 8 ++++---- navigation.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index eafa90499..0a1c0c68e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -906,7 +906,7 @@ function PMA_reloadNavigation() // in this case, get rid of the table limit offset, otherwise // we have a problem when dropping a table on the last page // and the offset becomes greater than the total number of tables - unset($_SESSION['table_limit_offset']); + unset($_SESSION['userconf']['table_limit_offset']); echo "\n"; $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&'); ?> diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 25a6458d7..d0861f57a 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -42,13 +42,13 @@ require_once './libraries/common.inc.php'; /** * limits for table list */ -if (! isset($_SESSION['table_limit_offset'])) { - $_SESSION['table_limit_offset'] = 0; +if (! isset($_SESSION['userconf']['table_limit_offset'])) { + $_SESSION['userconf']['table_limit_offset'] = 0; } if (isset($_REQUEST['pos'])) { - $_SESSION['table_limit_offset'] = (int) $_REQUEST['pos']; + $_SESSION['userconf']['table_limit_offset'] = (int) $_REQUEST['pos']; } -$pos = $_SESSION['table_limit_offset']; +$pos = $_SESSION['userconf']['table_limit_offset']; /** * fills given tooltip arrays diff --git a/navigation.php b/navigation.php index 87533ae05..aa60d2535 100644 --- a/navigation.php +++ b/navigation.php @@ -269,7 +269,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * user can find a navigator to page thru all tables. * * @todo instead of the 0 parameter, keep track of the - * offset in the list of tables ($_SESSION['navi_table_limit_offset']) + * offset in the list of tables ($_SESSION['userconf']['table_limit_offset']) * and use PMA_listNavigator(); do not just check pos in REQUEST * but add another hidden param to see if it's the pos of databases * or the pos of tables.