diff options
| author | Marc Delisle <marc@infomarc.info> | 2012-08-13 15:51:35 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2012-08-13 15:51:35 +0400 |
| commit | bb982053899718f94471ce3f5728ab963c11dda3 (patch) | |
| tree | 253d24b2deb9a9af8954b030b1187d68207f62dd /js/db_structure.js | |
| parent | 2df005b9e525e9393605abe6cfc8e0b536a542cc (diff) | |
Fix merge conflicts for security patch
Diffstat (limited to 'js/db_structure.js')
| -rw-r--r-- | js/db_structure.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/db_structure.js b/js/db_structure.js index 8b0629713e..223e02ea12 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -307,7 +307,7 @@ $(function() { */ var question = PMA_messages.strTruncateTableStrongWarning + ' ' - + $.sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + curr_table_name); + + $.sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + escapeHtml(curr_table_name)); $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) { @@ -366,10 +366,10 @@ $(function() { if (! is_view) { question = PMA_messages.strDropTableStrongWarning + ' ' - + $.sprintf(PMA_messages.strDoYouReally, 'DROP TABLE ' + curr_table_name); + + $.sprintf(PMA_messages.strDoYouReally, 'DROP TABLE ' + escapeHtml(curr_table_name)); } else { question = - $.sprintf(PMA_messages.strDoYouReally, 'DROP VIEW ' + curr_table_name); + $.sprintf(PMA_messages.strDoYouReally, 'DROP VIEW ' + escapeHtml(curr_table_name)); } $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) { |