The branch, QA_3_4 has been updated
       via  29b694c2256c90b3d8413b071e11bf992d6afddb (commit)
      from  da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit)


- Log -----------------------------------------------------------------
commit 29b694c2256c90b3d8413b071e11bf992d6afddb
Author: Marc Delisle <[email protected]>
Date:   Fri Aug 19 16:16:51 2011 -0400

    bug #3392920 [edit] BLOB emptied after editing another column

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

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 366edaf..97b7ef350a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,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 e1d98c8..8ebade8 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -110,7 +110,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
-- 
phpMyAdmin

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to