[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-18-g346c70d

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  346c70d6fd7a6e402e41dfd552f70e3bdaf83323 (commit)
      from  5d1fa1cc6b9cd6b2a96a67cd79216354a3c3e77f (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    1 +
 tbl_replace.php |    9 +++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee2dccf..6d8e6b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,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 f7cc17c..98d1b28 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -218,6 +218,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
-- 
phpMyAdmin