diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index ba63b3a6be..3dacd7bb68 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -551,6 +551,29 @@ class PMA_NavigationTree { return $retval; } + /** + * Renders the parameters that are required on the client + * side to know which page(s) we will be requesting data from + * + * @param Node $node The node to create the pagination parameters for + * + * @return string + */ + private function getPaginationParamsHtml($node) + { + $retval = ''; + $paths = $node->getPaths(); + if (isset($paths['a_path_clean'][2])) { + $retval .= "" . $paths['a_path_clean'][2] . ""; + $retval .= "" . $node->pos2 . ""; + } + if (isset($paths['a_path_clean'][4])) { + $retval .= "" . $paths['a_path_clean'][4] . ""; + $retval .= "" . $node->pos3 . ""; + } + return $retval; + } + /** * Renders a single node or a branch of the tree * @@ -631,14 +654,7 @@ class PMA_NavigationTree { $retval .= "" . $paths['a_path'] . ""; $retval .= "" . $paths['v_path'] . ""; $retval .= "" . $this->pos . ""; - if (isset($paths['a_path_clean'][2])) { - $retval .= "" . $paths['a_path_clean'][2] . ""; - $retval .= "" . $node->pos2 . ""; - } - if (isset($paths['a_path_clean'][4])) { - $retval .= "" . $paths['a_path_clean'][4] . ""; - $retval .= "" . $node->pos3 . ""; - } + $retval .= $this->getPaginationParamsHtml($node); $retval .= $icon; $retval .= ""; @@ -646,14 +662,7 @@ class PMA_NavigationTree { } else { $retval .= "