[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9325-gb58db4c

[Michal Čihař]

The branch, master has been updated
       via  b58db4c2e7da52e72baae907c180ed71200e1249 (commit)
       via  73ce5705bd1e0b62060f75702d62f88247ce09dd (commit)
      from  0bf02f05f14065bc4f67218f9c089099fad41cb1 (commit)


- Log -----------------------------------------------------------------
commit b58db4c2e7da52e72baae907c180ed71200e1249
Merge: 0bf02f05f14065bc4f67218f9c089099fad41cb1 73ce5705bd1e0b62060f75702d62f88247ce09dd
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Aug 30 17:30:47 2010 +0200

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    1 +
 setup/frames/index.inc.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23ee447..682a8d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,7 @@ $Id$
   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 1b1285c..00723cd 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -117,7 +117,7 @@ display_form_top('index.php', 'get', array(
 <?php foreach ($cf->getServers() 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">


hooks/post-receive
-- 
phpMyAdmin