Merge branch 'QA_3_3'

Conflicts: libraries/core.lib.php server_databases.php server_privileges.php
2010-08-20 13:40:37 +02:00
parent 7b1c0187cf 41145feb12
commit 862e3ca2a7
16 changed files with 84 additions and 40 deletions
--- a/db_search.php
+++ b/db_search.php
@@ -336,7 +336,7 @@ $alter_select =
    <tr><td align="right">
            <?php echo __('Inside column:'); ?></td>
        <td><input type="text" name="field_str" size="60"
-                value="<?php echo ! empty($field_str) ? $field_str : ''; ?>" /></td>
+                value="<?php echo ! empty($field_str) ? htmlspecialchars($field_str) : ''; ?>" /></td>
    </tr>
    </table>
 </fieldset>