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

Merge pull request #766 from slimtim/bug_4159

Browse Source 
Prevent fatal PHP error when filtering tables in the navigation tree
This commit is contained in:
Marc Delisle 2013-11-22 03:02:18 -08:00
commit 444068ad36
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,11 +692,14 @@ class PMA_NavigationTree
}
if (! empty($this->_searchClause) || ! empty($this->_searchClause2)) {
$results = 0;
if (! empty($this->_searchClause2)) {
$results = $node->realParent()->getPresence(
$node->real_name,
$this->_searchClause2
);
if (is_object($node->realParent())) {
$results = $node->realParent()->getPresence(
$node->real_name,
$this->_searchClause2
);
}
} else {
$results = $this->_tree->getPresence(
'databases',