handle when ServerDefault is 0
This commit is contained in:
9
main.php
9
main.php
@@ -28,13 +28,14 @@ if (! empty($message)) {
|
||||
|
||||
$common_url_query = PMA_generate_common_url('', '');
|
||||
|
||||
// when $server > 0, a server has been chosen so we can display
|
||||
// all MySQL-related information
|
||||
if ($server > 0) {
|
||||
require './libraries/server_common.inc.php';
|
||||
require './libraries/StorageEngine.class.php';
|
||||
require './libraries/server_links.inc.php';
|
||||
}
|
||||
|
||||
// robbat2: Use the verbose name of the server instead of the hostname
|
||||
// Use the verbose name of the server instead of the hostname
|
||||
// if a value is set
|
||||
$server_info = '';
|
||||
if (! empty($cfg['Server']['verbose'])) {
|
||||
@@ -55,6 +56,7 @@ $mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();');
|
||||
$short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
|
||||
? $GLOBALS['cfg']['Server']['verbose']
|
||||
: $GLOBALS['cfg']['Server']['host']);
|
||||
}
|
||||
|
||||
echo '<div id="maincontainer">' . "\n";
|
||||
echo '<div id="main_pane_left">';
|
||||
@@ -203,11 +205,12 @@ if ($server > 0) {
|
||||
}
|
||||
|
||||
|
||||
if ($server > 0) {
|
||||
echo '<div class="group">';
|
||||
echo '<h2>' . $strWebServer . '</h2>';
|
||||
echo '<ul>';
|
||||
PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
|
||||
|
||||
if ($server > 0) {
|
||||
PMA_printListItem($strMysqlClientVersion . ': ' . PMA_DBI_get_client_info(),
|
||||
'li_mysql_client_version');
|
||||
PMA_printListItem($strPHPExtension . ': ' . $GLOBALS['cfg']['Server']['extension'],
|
||||
|
Reference in New Issue
Block a user