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

Do not forget wrongly configured servers, otherwise user gets warning only on first access (RFE #1451521).

Browse Source
This commit is contained in:
Michal Čihař
2006-03-16 21:58:37 +00:00
parent 9dde64b3bf
commit a70def98ca
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -12,6 +12,8 @@ $Source$
* libraries/select_server.lib.php: Move end of fieldset to correct place * libraries/select_server.lib.php: Move end of fieldset to correct place
after button (patch #1450559). after button (patch #1450559).
* libraries/plugin_interface.lib.php: Add support for hidden inputs. * libraries/plugin_interface.lib.php: Add support for hidden inputs.
* libraries/common.lib.php: Do not forget wrongly configured servers,
otherwise user gets warning only on first access (RFE #1451521).
2006-03-15 Michal Čihař <michal@cihar.com> 2006-03-15 Michal Čihař <michal@cihar.com>
* libraries/export/htmlexcel.php: Fix output handling (bug #1450555). * libraries/export/htmlexcel.php: Fix output handling (bug #1450555).

4
libraries/common.lib.php
View File

@@ -2865,9 +2865,10 @@ if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
$new_servers = array(); $new_servers = array();
foreach ($cfg['Servers'] as $server_index => $each_server) { foreach ($cfg['Servers'] as $server_index => $each_server) {
// Detect wrong configuration
if (!is_int($server_index) || $server_index < 1) { if (!is_int($server_index) || $server_index < 1) {
$GLOBALS['PMA_errors'][] = sprintf($strInvalidServerIndex, $server_index); $GLOBALS['PMA_errors'][] = sprintf($strInvalidServerIndex, $server_index);
continue;
} }
$each_server = array_merge($default_server, $each_server); $each_server = array_merge($default_server, $each_server);
@@ -2875,7 +2876,6 @@ if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
// Don't use servers with no hostname // Don't use servers with no hostname
if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) { if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) {
$GLOBALS['PMA_errors'][] = sprintf($strInvalidServerHostname, $server_index); $GLOBALS['PMA_errors'][] = sprintf($strInvalidServerHostname, $server_index);
continue;
} }
// Final solution to bug #582890 // Final solution to bug #582890