Merge branch 'QA_4_7'

This commit is contained in:
Michal Čihař 2017-04-04 09:49:55 +02:00
commit 8a692c015c
2 changed files with 4 additions and 0 deletions

View File

@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
- issue #13150 Fixed pagination while browsing resuls
- issue #13149 Fixed outbound links in changelog.php
- issue #13146 Do not include devel dependencies in the release
- issue #13144 Do not show New as a database in database dropdown
4.7.0 (2017-03-28)
- patch #12233 [Display] Improve message when renaming database to same name

View File

@ -1274,6 +1274,9 @@ class NavigationTree
. '(' . __('Databases') . ') ...</option>' . "\n";
$selected = $GLOBALS['db'];
foreach ($children as $node) {
if ($node->isNew) {
continue;
}
$paths = $node->getPaths();
if (isset($node->links['text'])) {
$title = empty($node->links['title']) ? '' : $node->links['title'];