Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-02-21 12:21:31 +01:00
commit f5e455dee3

View File

@ -951,7 +951,6 @@ class PMA_NavigationTree
$retval .= htmlspecialchars($node->real_name);
$retval .= "</a>";
}
$retval .= '<div class="clearfloat"></div>';
} else {
$retval .= "{$node->name}";
}
@ -959,6 +958,7 @@ class PMA_NavigationTree
$retval .= "</i>";
}
$retval .= $node->getHtmlForControlButtons();
$retval .= '<div class="clearfloat"></div>';
$wrap = true;
} else {
$node->visible = true;