The branch, master has been updated via 9ec14c786c2a6917c458198c1c256c3d534cbc8d (commit) via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) from ba0ca1851a2605c17f23bd850b5c1575a11f83bb (commit) - Log ----------------------------------------------------------------- commit 9ec14c786c2a6917c458198c1c256c3d534cbc8d Merge: ba0ca1851a2605c17f23bd850b5c1575a11f83bb b76df0d6099704dad6414d4fe4aaccb6694b61a5 Author: Marc Delisle <marc@infomarc.info> Date: Wed Apr 28 13:15:49 2010 -0400 Avoid selecting UNHEX function by default for a BLOB column for which editing is protected ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ tbl_change.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0866d4..cc81a36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,8 @@ $Id$ - bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2975408 [tracking] Data too long for column data_sql - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_change.php b/tbl_change.php index 57b8912..3f42c40 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -497,7 +497,7 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting - if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } hooks/post-receive -- phpMyAdmin