Permalink
Browse files

Merge branch 'QA_3_4' into MAINT_3_5_2

  • Loading branch information...
2 parents 4b133e2 + cc97d82 commit 46819b311ca25848d0ec4fe9425817b6f9277ec1 @lem9 lem9 committed Aug 12, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −1 js/db_structure.js
  2. +3 −1 tbl_create.php
View
@@ -276,7 +276,7 @@ $(document).ready(function() {
/**
* @var question String containing the question to be asked for confirmation
*/
- var question = 'TRUNCATE ' + curr_table_name;
+ var question = 'TRUNCATE ' + escapeHtml(curr_table_name);
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) {
View
@@ -272,7 +272,9 @@
$new_table_string .= '<td align="center"> <input type="checkbox" id="checkbox_tbl_" name="selected_tbl[]" value="'.htmlspecialchars($table).'" /> </td>' . "\n";
$new_table_string .= '<th>';
- $new_table_string .= '<a href="sql.php' . PMA_generate_common_url($tbl_url_params) . '">'. $table . '</a>';
+ $new_table_string .= '<a href="sql.php'
+ . PMA_generate_common_url($tbl_url_params) . '">'
+ . htmlspecialchars($table) . '</a>';
if (PMA_Tracker::isActive()) {
$truename = str_replace(' ', '&nbsp;', htmlspecialchars($table));

0 comments on commit 46819b3

Please sign in to comment.