nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[edit] Do not default to UNHEX when using file upload.

Browse Source
This commit is contained in:
Michal Čihař
2010-01-22 17:33:27 +00:00
parent 429275e834
commit 58d31214a1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -31,6 +31,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ rfe #1025696 [browse] Add direct download of binary fields. + rfe #1025696 [browse] Add direct download of binary fields.
- [browse] Properly display NULL value for BLOB. - [browse] Properly display NULL value for BLOB.
- rfe #1516803 [edit] Allow to set BLOB to/from NULL with ProtectBinary. - 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) 3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields, + rfe #2308632 [edit] Use hex for (var)binary fields,

2
tbl_change.php
View File

@@ -439,7 +439,7 @@ foreach ($rows as $row_id => $vrow) {
} else { } else {
// loic1: special binary "characters" // loic1: special binary "characters"
if ($field['is_binary'] || $field['is_blob']) { 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']]); $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
$field['display_binary_as_hex'] = true; $field['display_binary_as_hex'] = true;
} else { } else {