Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2011-07-03 04:52:10 +0400
committerMarc Delisle <marc@infomarc.info>2011-07-03 04:52:10 +0400
commit12fcc270f2d0cc7df3a94a131e2f234b0ee8414c (patch)
tree28ed6cc7b976465eb96db4880ac5afe2fe6bd364 /setup
parenta45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f (diff)
parent041cd7e7d2dfa95dd055da6fd2eb5308902fda95 (diff)
Merge branch 'QA_3_4'
Diffstat (limited to 'setup')
-rw-r--r--setup/lib/ConfigGenerator.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
index 2872221c08..f3c6ed8e78 100644
--- a/setup/lib/ConfigGenerator.class.php
+++ b/setup/lib/ConfigGenerator.class.php
@@ -39,7 +39,7 @@ class ConfigGenerator
if ($cf->getServerCount() > 0) {
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
foreach ($c['Servers'] as $id => $server) {
- $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf
+ $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf
. '$i++;' . $crlf;
foreach ($server as $k => $v) {
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);