diff --git a/js/navigation.js b/js/navigation.js index 4bf72825c6..e4edf1fa0e 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -228,8 +228,8 @@ function PMA_reloadNavigation() { if ($(this).find('img').is('.ic_b_minus') && $(this).closest('li').find('div.list_container .ic_b_minus').length == 0 ) { - params['aPath_' + count] = $(this).find('span.aPath').text(); - params['vPath_' + count] = $(this).find('span.vPath').text(); + params['n' + count + '_aPath'] = $(this).find('span.aPath').text(); + params['n' + count + '_vPath'] = $(this).find('span.vPath').text(); var pos2_name = $(this).find('span.pos2_name').text(); if (! pos2_name) { @@ -248,11 +248,11 @@ function PMA_reloadNavigation() { .text(); } - params['pos2_name_' + count] = pos2_name; - params['pos2_value_' + count] = pos2_value; + params['n' + count + '_pos2_name'] = pos2_name; + params['n' + count + '_pos2_value'] = pos2_value; - params['pos3_name_' + count] = $(this).find('span.pos3_name').text(); - params['pos3_value_' + count] = $(this).find('span.pos3_value').text(); + params['n' + count + '_pos3_name'] = $(this).find('span.pos3_name').text(); + params['n' + count + '_pos3_value'] = $(this).find('span.pos3_value').text(); count++; } }); diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index ed8c4a6363..a5503396e9 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -94,28 +94,28 @@ class PMA_NavigationTree { $this->pos3_name[0] = $_REQUEST['pos3_name']; $this->pos3_value[0] = $_REQUEST['pos3_value']; } - } else if (isset($_REQUEST['aPath_0'])) { + } else if (isset($_REQUEST['n0_aPath'])) { $count = 0; - while (isset($_REQUEST['aPath_' . $count])) { + while (isset($_REQUEST['n' . $count . '_aPath'])) { $this->_aPath[$count] = $this->parsePath( - $_REQUEST['aPath_' . $count] + $_REQUEST['n' . $count . '_aPath'] ); - $this->pos2_name[$count] = $_REQUEST['pos2_name_' . $count]; - $this->pos2_value[$count] = $_REQUEST['pos2_value_' . $count]; - if (isset($_REQUEST['pos3_name_' . $count])) { - $this->pos3_name[$count] = $_REQUEST['pos3_name_' . $count]; - $this->pos3_value[$count] = $_REQUEST['pos3_value_' . $count]; + $this->pos2_name[$count] = $_REQUEST['n' . $count . '_pos2_name']; + $this->pos2_value[$count] = $_REQUEST['n' . $count . '_pos2_value']; + if (isset($_REQUEST['n' . $count . '_pos3_name'])) { + $this->pos3_name[$count] = $_REQUEST['n' . $count . '_pos3_name']; + $this->pos3_value[$count] = $_REQUEST['n' . $count . '_pos3_value']; } $count++; } } if (isset($_REQUEST['vPath'])) { $this->_vPath[0] = $this->parsePath($_REQUEST['vPath']); - } else if (isset($_REQUEST['vPath_0'])) { + } else if (isset($_REQUEST['n0_vPath'])) { $count = 0; - while (isset($_REQUEST['vPath_' . $count])) { + while (isset($_REQUEST['n' . $count . '_vPath'])) { $this->_vPath[$count] = $this->parsePath( - $_REQUEST['vPath_' . $count] + $_REQUEST['n' . $count . '_vPath'] ); $count++; }