The branch, master has been updated
via 9f971220d0331dda4832005b86ff20ecfabafdf5 (commit)
via 7e5584ed2eff694e6d0b354b684b04412274b59d (commit)
from 62556cb5b61be5ceb30219bf778154a6da4c363d (commit)
- Log -----------------------------------------------------------------
commit 9f971220d0331dda4832005b86ff20ecfabafdf5
Merge: 62556cb5b61be5ceb30219bf778154a6da4c363d 7e5584ed2eff694e6d0b354b684b04412274b59d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sat May 29 07:06:22 2010 -0400
resolve merge conflicts
-----------------------------------------------------------------------
Summary of changes:
tbl_change.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tbl_change.php b/tbl_change.php
index 5c00885..62fbbf1 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -457,7 +457,7 @@ foreach ($rows as $row_id => $vrow) {
$special_chars = PMA_printable_bit_value($vrow[$field['Field']],
$extracted_fieldspec['spec_in_brackets']);
} else {
// 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']) {
$vrow[$field['Field']] =
bin2hex($vrow[$field['Field']]);
$field['display_binary_as_hex'] = true;
hooks/post-receive
--
phpMyAdmin