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

move server choice into MySQL container

Browse Source
This commit is contained in:
Marc Delisle
2005-11-25 14:45:22 +00:00
parent fb3a870d56
commit b9120de531
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-11-25 Marc Delisle <lem9@users.sourceforge.net>
* main.php: move server choice into MySQL container
2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/url_generating.lib.php: * libraries/url_generating.lib.php:
- do not htmlentities on whole string - do not htmlentities on whole string

16
main.php
View File

@@ -33,14 +33,6 @@ if ( ! empty( $message ) ) {
unset( $message ); unset( $message );
} }
/**
* Displays the MySQL servers choice form
*/
if (!$cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1) {
include('./libraries/select_server.lib.php');
PMA_select_server(TRUE, FALSE);
}
$common_url_query = PMA_generate_common_url( '', '' ); $common_url_query = PMA_generate_common_url( '', '' );
// this div is required for containing divs can be 50% // this div is required for containing divs can be 50%
@@ -85,6 +77,14 @@ if ( $server > 0 ) {
echo '<h1 xml:lang="en" dir="ltr">MySQL - ' . PMA_MYSQL_STR_VERSION echo '<h1 xml:lang="en" dir="ltr">MySQL - ' . PMA_MYSQL_STR_VERSION
.'</h1>' . "\n"; .'</h1>' . "\n";
/**
* Displays the MySQL servers choice form
*/
if (!$cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1) {
include('./libraries/select_server.lib.php');
PMA_select_server(TRUE, FALSE);
}
echo '<ul>' . "\n"; echo '<ul>' . "\n";
PMA_printListItem( $strProtocolVersion . ': ' . PMA_DBI_get_proto_info() PMA_printListItem( $strProtocolVersion . ': ' . PMA_DBI_get_proto_info()