Fix bugs in navigation

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-11-06 13:31:29 -08:00
parent 93d23e4494
commit 53f1364cff

View File

@ -433,9 +433,9 @@ class Node
break 2;
}
}
$prefixes = array_slice(array_keys($prefixMap), $pos);
}
}
$prefixes = array_slice(array_keys($prefixMap), $pos);
foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
$query = "SHOW DATABASES LIKE '" . $db . "'";
@ -482,7 +482,6 @@ class Node
$retval = array();
$count = 0;
foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
$retval = array();
$query = "SHOW DATABASES LIKE '" . $db . "'";
$handle = $GLOBALS['dbi']->tryQuery($query);
if ($handle !== false) {
@ -598,7 +597,8 @@ class Node
*
* @return array array of databases
*/
private function _getDatabasesToSearch($searchClause) {
private function _getDatabasesToSearch($searchClause)
{
if (! empty($searchClause)) {
$databases = array(
"%" . PMA_Util::sqlAddSlashes($searchClause, true) . "%"