bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php

This commit is contained in:
Herman van Rink
2009-06-21 22:49:57 +00:00
parent a7f741391d
commit 9c11d553d4
2 changed files with 2 additions and 1 deletions

View File

@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug [display] Incorrect display in replication status,
thanks to Tomas Srnka - tomassrnka
- bug #1601625 [display] The Ignore checkbox is not unchecked for ENUM
- bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php
3.2.0.0 (2009-06-15)
- [core] better support for vendor customisation (based on what Debian needs)

View File

@@ -286,10 +286,10 @@ class ConfigFile
if ($this->getServerCount() > 0) {
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
foreach ($c['Servers'] as $id => $server) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
$ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf
. '$i++;' . $crlf;
foreach ($server as $k => $v) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
$ret .= "\$cfg['Servers'][\$i]['$k'] = "
. var_export($v, true) . ';' . $crlf;
}