Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Przybylski <piotrprz@gmail.com>2011-06-28 01:55:32 +0400
committerPiotr Przybylski <piotrprz@gmail.com>2011-06-28 01:55:32 +0400
commit3bde595666bf7cdcc8b28738d5396f8a8258af90 (patch)
tree7456de1dc339fcfc44b58ae2770c76c9d47f3c1e /tbl_alter.php
parentc734e1fd14094c2545c8305e35358e57cf485ab7 (diff)
parent49a39787c3d44817c4c9056e0488d420a0e000ab (diff)
Merge remote-tracking branch 'origin/master' into drizzle
Diffstat (limited to 'tbl_alter.php')
-rw-r--r--tbl_alter.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/tbl_alter.php b/tbl_alter.php
index 375f2f72b6..a13b7d7f47 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -131,7 +131,8 @@ if (isset($_REQUEST['do_save_data'])) {
}
if( $GLOBALS['is_ajax_request'] == true) {
- PMA_ajaxResponse($message, $message->isSuccess());
+ $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+ PMA_ajaxResponse($message, $message->isSuccess(),$extra_data);
}
$active_page = 'tbl_structure.php';
@@ -169,7 +170,7 @@ if ($abort == false) {
* @todo optimize in case of multiple fields to modify
*/
for ($i = 0; $i < $selected_cnt; $i++) {
- $_REQUEST['field'] = PMA_sqlAddslashes($selected[$i], true);
+ $_REQUEST['field'] = PMA_sqlAddSlashes($selected[$i], true);
$result = PMA_DRIZZLE
? PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' WHERE Field = \'' . $_REQUEST['field'] . '\';')
: PMA_DBI_query('SHOW FULL COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';');