diff options
| author | Marc Delisle <marc@infomarc.info> | 2011-11-25 01:54:25 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2011-11-25 01:54:25 +0400 |
| commit | 96dd071a5f2362d5a244656bf4acf240b5b1aac0 (patch) | |
| tree | ee3f0415d815deac1f1d0a45f7e622fa960a531a /js/db_operations.js | |
| parent | 03fd5593823d6999e85792a910d460902f844db3 (diff) | |
| parent | 29455fe79bc9896129d7004e0242c451f4a32cc8 (diff) | |
Fix merge conflicts
Diffstat (limited to 'js/db_operations.js')
| -rw-r--r-- | js/db_operations.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/db_operations.js b/js/db_operations.js index 9776cefe4c..bc61679680 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -32,7 +32,7 @@ $(document).ready(function() { var $form = $(this); - var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; + var question = escapeHtml('CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db); PMA_prepareForAjaxRequest($form); /** |