The branch, master has been updated via ac95cf21a82c7617338e1abb7c07821a62bd3f98 (commit) via 346c70d6fd7a6e402e41dfd552f70e3bdaf83323 (commit) from b3143e6cc0f35a83dd83cb4f03d7620bb36f71e3 (commit)
- Log ----------------------------------------------------------------- commit ac95cf21a82c7617338e1abb7c07821a62bd3f98 Merge: b3143e6 346c70d Author: Marc Delisle marc@infomarc.info Date: Sat Jan 21 06:56:25 2012 -0500
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + tbl_replace.php | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index a336163..d605f0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before - bug #3463933 [display] SELECT DISTINCT displays wrong total records found - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' +- bug #3469254 [edit] Setting data to NULL and drop-downs
3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/tbl_replace.php b/tbl_replace.php index 60dc7cf..8b8a58d 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -223,6 +223,15 @@ foreach ($loop_array as $rownumber => $where_clause) { if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) { $prot_row = PMA_DBI_fetch_single_row('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';'); } + + // When a select field is nullified, it's not present in $_REQUEST + // so initialize it; this way, the foreach($me_fields) will process it + foreach ($me_fields_name as $key => $val) { + if (! isset($me_fields[$key])) { + $me_fields[$key] = ''; + } + } + foreach ($me_fields as $key => $val) {
// Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key]
hooks/post-receive