The branch, master has been updated via c39e7bb14f371736977c250baef03d418166cb1e (commit) via 7e814a711aa5d2ca0a50b9da62bbd7ea004fed29 (commit) via 29b694c2256c90b3d8413b071e11bf992d6afddb (commit) from b527bd916c67849acc89c8cfd500461d9155d9b3 (commit)

- Log ----------------------------------------------------------------- commit c39e7bb14f371736977c250baef03d418166cb1e Merge: 7e814a7 b527bd9 Author: Marc Delisle marc@infomarc.info Date: Fri Aug 19 16:23:14 2011 -0400

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 7e814a711aa5d2ca0a50b9da62bbd7ea004fed29 Merge: 8b607b4 29b694c Author: Marc Delisle marc@infomarc.info Date: Fri Aug 19 16:17:25 2011 -0400

Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + libraries/tbl_replace_fields.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index f70eae5..85e45ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog - [core] Remove library PHPExcel, due to license issues - [export] Remove native Excel export modules (xls and xlsx formats) - [import] Remove native Excel import modules (xls and xlsx formats) +- bug #3392920 [edit] BLOB emptied after editing another column

3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index f1a0b9e..b408e6c 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -101,7 +101,7 @@ if (false !== $possibly_uploaded_val) { }

// The Null checkbox was unchecked for this field - if (empty($val) && isset($me_fields_null_prev[$key]) && ! isset($me_fields_null[$key])) { + if (empty($val) && ! empty($me_fields_null_prev[$key]) && ! isset($me_fields_null[$key])) { $val = "''"; } } // end else (field value in the form)

hooks/post-receive