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

resolve merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-05-29 07:06:22 -04:00
parent 62556cb5b6 7e5584ed2e
commit 9f971220d0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tbl_change.php
View File

@@ -457,7 +457,7 @@ foreach ($rows as $row_id => $vrow) {
$special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']); $special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
} else { } else {
// special binary "characters" // special binary "characters"
if ($field['is_binary'] || $field['is_blob']) { if ($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) {
if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
$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;