From 58d31214a1115dff3c5741026fa281f8865ac19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 22 Jan 2010 17:33:27 +0000 Subject: [PATCH] [edit] Do not default to UNHEX when using file upload. --- ChangeLog | 1 + tbl_change.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 233ec019c..d8980d257 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #1025696 [browse] Add direct download of binary fields. - [browse] Properly display NULL value for BLOB. - rfe #1516803 [edit] Allow to set BLOB to/from NULL with ProtectBinary. +- [edit] Do not default to UNHEX when using file upload. 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/tbl_change.php b/tbl_change.php index c24f8019a..2145ee88a 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -439,7 +439,7 @@ foreach ($rows as $row_id => $vrow) { } else { // loic1: special binary "characters" if ($field['is_binary'] || $field['is_blob']) { - if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$cfg['ProtectBinary']) { $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]); $field['display_binary_as_hex'] = true; } else {