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

bug #1330847

Browse Source
This commit is contained in:
Marc Delisle
2005-10-21 20:50:48 +00:00
parent 4373f1ae3c
commit d272a82042
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ $Source$
2005-10-21 Marc Delisle <lem9@users.sourceforge.net> 2005-10-21 Marc Delisle <lem9@users.sourceforge.net>
* libraries/relation.lib.php: foreign dropdowns: sort id-content by id * libraries/relation.lib.php: foreign dropdowns: sort id-content by id
and content-id by content and content-id by content
* libraries/common.lib.php: bug #1330847, undefined index connect_type
2005-10-21 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-10-21 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* db_details_export.php: * db_details_export.php:

5
libraries/common.lib.php
View File

@@ -1273,9 +1273,10 @@ if ($is_minimum_common == FALSE) {
/** /**
* Gets the valid servers list and parameters * Gets the valid servers list and parameters
*/ */
foreach ($cfg['Servers'] AS $key => $val) { foreach ($cfg['Servers'] AS $key => $val) {
// Don't use servers with no hostname // Don't use servers with no hostname
if ( ($val['connect_type'] == 'tcp') && empty($val['host'])) { if ( isset($val['connect_type']) && ($val['connect_type'] == 'tcp') && empty($val['host'])) {
unset($cfg['Servers'][$key]); unset($cfg['Servers'][$key]);
} }
@@ -1284,7 +1285,7 @@ if ($is_minimum_common == FALSE) {
// and there is nothing in the verbose server name // and there is nothing in the verbose server name
// or the host field, then generate a name for the server // or the host field, then generate a name for the server
// in the form of "Server 2", localized of course! // in the form of "Server 2", localized of course!
if ( ($val['connect_type'] == 'socket') && empty($val['host']) && empty($val['verbose']) ) { if ( isset($val['connect_type']) && $val['connect_type'] == 'socket' && empty($val['host']) && empty($val['verbose']) ) {
$cfg['Servers'][$key]['verbose'] = $GLOBALS['strServer'] . $key; $cfg['Servers'][$key]['verbose'] = $GLOBALS['strServer'] . $key;
$val['verbose'] = $GLOBALS['strServer'] . $key; $val['verbose'] = $GLOBALS['strServer'] . $key;
} }