Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-01-24 17:44:57 +01:00
commit 5fed2eef3a

View File

@ -254,7 +254,8 @@ class PMA_NavigationHeader
{
$retval = '';
if ($GLOBALS['cfg']['NavigationDisplayServers']
&& count($GLOBALS['cfg']['Servers']) > 1) {
&& count($GLOBALS['cfg']['Servers']) > 1
) {
include_once './libraries/select_server.lib.php';
$retval .= '<!-- SERVER CHOICE START -->';
$retval .= '<div id="serverChoice">';