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

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-10-26 07:06:23 +01:00
commit 90d4abd400
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,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.class.php
View File

@ -451,7 +451,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')) ";
@ -482,7 +483,7 @@ class Node
}
$query = "SHOW DATABASES ";
$query .= $this->_getWhereClause('Database', '');
$query .= $this->_getWhereClause('Database', $searchClause);
$query .= " AND (";
$subClauses = array();
foreach ($prefixes as $prefix) {

2
test/classes/navigation/PMA_Node_test.php
View File

@ -362,7 +362,7 @@ class Node_Test extends PHPUnit_Framework_TestCase
$expectedSql .= "ORDER BY DB_first_level ASC ";
$expectedSql .= "LIMIT $pos, $limit";
$expectedSql .= ") t2 ";
$expectedSql .= "WHERE 1 = LOCATE(CONCAT(DB_first_level, '_'), ";
$expectedSql .= "WHERE TRUE AND 1 = LOCATE(CONCAT(DB_first_level, '_'), ";
$expectedSql .= "CONCAT(SCHEMA_NAME, '_')) ";
$expectedSql .= "ORDER BY SCHEMA_NAME ASC";