The branch, QA_3_3 has been updated via 73ce5705bd1e0b62060f75702d62f88247ce09dd (commit) from 061b87f11f09633fbfe21d8c35f520ca9b80ff60 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 da27bea..076faab 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 1c93aee..fb37b90 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"> hooks/post-receive -- phpMyAdmin