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

Merge branch 'QA_4_5'

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-10-26 16:57:58 +11:00
commit f4dee6a0f5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- issue #11592 Missing headers in zipped export
- issue #11590 Parser: Array to string conversion
- issue #11597 Huge binary log growth on 4.5.x
- issue #11594 'only_db' config option bug when db names contain underscore and are grouped
4.5.1.0 (2015-10-23)
- issue Invalid argument supplied for foreach()

5
libraries/navigation/nodes/Node.php
View File

@ -446,7 +446,8 @@ class Node
$query .= "ORDER BY DB_first_level ASC ";
$query .= "LIMIT $pos, $maxItems";
$query .= ") t2 ";
$query .= "WHERE 1 = LOCATE(CONCAT(DB_first_level, ";
$query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
$query .= " AND 1 = LOCATE(CONCAT(DB_first_level, ";
$query .= "'$dbSeparator'), ";
$query .= "CONCAT(SCHEMA_NAME, ";
$query .= "'$dbSeparator')) ";
@ -478,7 +479,7 @@ class Node
}
$query = "SHOW DATABASES ";
$query .= $this->_getWhereClause('Database', '');
$query .= $this->_getWhereClause('Database', $searchClause);
$query .= " AND (";
$subClauses = array();
foreach ($prefixes as $prefix) {