From 73ce5705bd1e0b62060f75702d62f88247ce09dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Mon, 30 Aug 2010 17:30:37 +0200
Subject: [PATCH] [setup] Fixed escaping of server name.

---
 ChangeLog                  | 1 +
 setup/frames/index.inc.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index da27bea82..076faabf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   a page size increase, thanks to Martin Schönberger - mad05
 - bug #3054458 [core] Fixed displaying number of rows.
 - bug #3035300 [parser] Fixed wrong definition of keywords.
+- [setup] Fixed escaping of server name.
 
 3.3.6.0 (2010-08-28)
 - bug #3033063 [core] Navi gets wrong db name
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 1c93aee40..fb37b901a 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -126,7 +126,7 @@ display_form_top('index.php', 'get', array(
 <?php foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server): ?>
 <tr>
     <td><?php echo $id ?></td>
-    <td><?php echo $cf->getServerName($id) ?></td>
+    <td><?php echo htmlspecialchars($cf->getServerName($id)) ?></td>
     <td><?php echo htmlspecialchars($cf->getValue("Servers/$id/auth_type")) ?></td>
     <td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td>
     <td style="white-space: nowrap">