[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-2274-ga63ac12

[Marc Delisle]

The branch, master has been updated
       via  a63ac127bfc0ff6faceafebc8e5bc70b63a88db1 (commit)
      from  74164e5fc0143abb5e08ab64f0cfb4b0e452abde (commit)


- Log -----------------------------------------------------------------
commit a63ac127bfc0ff6faceafebc8e5bc70b63a88db1
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Apr 15 15:53:42 2011 -0400

    bug #3287596 BLOB emptied after editing another column

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

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

diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index 84377bf..e1d98c8 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -68,7 +68,7 @@ if (false !== $possibly_uploaded_val) {
     }
 
     // $key contains the md5() of the fieldname
-    if (0 === strlen($val)) {
+    if (0 === strlen($val) && $type != 'protected') {
         // best way to avoid problems in strict mode (works also in non-strict mode)
         if (isset($me_auto_increment)  && isset($me_auto_increment[$key])) {
             $val = 'NULL';


hooks/post-receive
-- 
phpMyAdmin