Fix merge conflicts

2011-11-24 12:26:31 -05:00
parent f414a0ec32 077c10020e
commit cf5faa1dd1
6 changed files with 13 additions and 11 deletions
--- 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);
        /**