[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-27-g7e5584e

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  7e5584ed2eff694e6d0b354b684b04412274b59d (commit)
      from  f483cdb1233ea9db1d3d85d498f2ad22b6f578ee (commit)


- Log -----------------------------------------------------------------
commit 7e5584ed2eff694e6d0b354b684b04412274b59d
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat May 29 06:56:27 2010 -0400

    problem showing UNHEX function by default when editing a BLOB was not fixed correctly in version 3.3.3

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

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 d7b86dd..9731974 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -442,7 +442,7 @@ foreach ($rows as $row_id => $vrow) {
                 $special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
             } else {
                 // loic1: 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