From dd898010ba1790788d86c7befe2245ac40132f67 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 13 Jan 2009 21:59:45 +0000 Subject: [PATCH] patch #2496403 [display] Multi-row change with "]" --- ChangeLog | 2 ++ libraries/display_tbl.lib.php | 2 +- tbl_change.php | 2 +- tbl_replace.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 305dfea66..628fb4d50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.1.3.0 (not yet released) + [lang] Turkish update, thanks to Burak Yavuz +- patch #2496403 [display] Multi-row change with "]", + thanks to Virsacer - virsacer 3.1.2.0 (not yet released) - bug #1253252 [display] Can't NULL a column with relation defined diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index bfed59177..7934725b8 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1048,7 +1048,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { * avoid to display the delete and edit links */ $unique_condition = PMA_getUniqueCondition($dt_result, $fields_cnt, $fields_meta, $row); - $unique_condition_html = htmlspecialchars($unique_condition); + $unique_condition_html = htmlspecialchars(str_replace(']', ']', $unique_condition)); // 1.2 Defines the URLs for the modify/delete link(s) diff --git a/tbl_change.php b/tbl_change.php index adeb91cb9..b81056f22 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -166,7 +166,7 @@ if (isset($primary_key)) { $result = array(); $found_unique_key = false; foreach ($primary_key_array as $key_id => $primary_key) { - $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . ' WHERE ' . $primary_key . ';'; + $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . ' WHERE ' . str_replace(']', ']', $primary_key) . ';'; $result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE); $rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]); $primary_keys[$key_id] = str_replace('\\', '\\\\', $primary_key); diff --git a/tbl_replace.php b/tbl_replace.php index e8ea8c100..c3cc0b872 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -285,7 +285,7 @@ foreach ($loop_array as $rowcount => $primary_key) { } else { // build update query $query[] = 'UPDATE ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($GLOBALS['table']) - . ' SET ' . implode(', ', $query_values) . ' WHERE ' . $primary_key . ' LIMIT 1'; + . ' SET ' . implode(', ', $query_values) . ' WHERE ' . str_replace(']', ']', $primary_key) . ' LIMIT 1'; } }