Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
--- a/db_sql.php
+++ b/db_sql.php
@@ -39,7 +39,7 @@ if ($num_tables == 0 && empty($db_query_force)) {
 /**
 * Query box, bookmark, insert data from textfile
 */
-PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';');
+PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';');

 /**
 * Displays the footer