nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-08-30 17:30:47 +02:00
parent 0bf02f05f1 73ce5705bd
commit b58db4c2e7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -119,6 +119,7 @@ $Id$
a page size increase, thanks to Martin Schönberger - mad05 a page size increase, thanks to Martin Schönberger - mad05
- bug #3054458 [core] Fixed displaying number of rows. - bug #3054458 [core] Fixed displaying number of rows.
- bug #3035300 [parser] Fixed wrong definition of keywords. - bug #3035300 [parser] Fixed wrong definition of keywords.
- [setup] Fixed escaping of server name.
3.3.6.0 (2010-08-28) 3.3.6.0 (2010-08-28)
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name

2
setup/frames/index.inc.php
View File

@@ -117,7 +117,7 @@ display_form_top('index.php', 'get', array(
<?php foreach ($cf->getServers() as $id => $server): ?> <?php foreach ($cf->getServers() as $id => $server): ?>
<tr> <tr>
<td><?php echo $id ?></td> <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->getValue("Servers/$id/auth_type")) ?></td>
<td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td> <td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td>
<td style="white-space: nowrap"> <td style="white-space: nowrap">