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

Don't fail when refreshing the navigation

Browse Source
This commit is contained in:
Rouslan Placella 2012-08-06 16:32:45 +02:00
parent 1379cf881c
commit 07a764246a
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/navigation/NavigationTree.class.php
View File

@ -587,27 +587,24 @@ class PMA_NavigationTree
*/
public function renderState()
{
$node = $this->_buildPath();
$retval = false;
if ($node !== false) {
$retval = $this->_fastFilterHtml($this->_tree);
$retval .= $this->_getPageSelector($this->_tree);
$this->groupTree();
$retval .= "<div><ul>";
$children = $this->_tree->children;
usort($children, array('PMA_NavigationTree', 'sortNode'));
$this->_setVisibility();
for ($i=0; $i<count($children); $i++) {
if ($i == 0) {
$retval .= $this->_renderNode($children[0], true, 'first');
} else if ($i + 1 != count($children)) {
$retval .= $this->_renderNode($children[$i], true);
} else {
$retval .= $this->_renderNode($children[$i], true, 'last');
}
$this->_buildPath();
$retval = $this->_fastFilterHtml($this->_tree);
$retval .= $this->_getPageSelector($this->_tree);
$this->groupTree();
$retval .= "<div><ul>";
$children = $this->_tree->children;
usort($children, array('PMA_NavigationTree', 'sortNode'));
$this->_setVisibility();
for ($i=0; $i<count($children); $i++) {
if ($i == 0) {
$retval .= $this->_renderNode($children[0], true, 'first');
} else if ($i + 1 != count($children)) {
$retval .= $this->_renderNode($children[$i], true);
} else {
$retval .= $this->_renderNode($children[$i], true, 'last');
}
$retval .= "</ul></div>";
}
$retval .= "</ul></div>";
return $retval;
}