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

Avoid selecting UNHEX function by default for a BLOB column for which editing is protected

Browse Source
This commit is contained in:
Marc Delisle
2010-04-28 13:06:09 -04:00
parent 06c8fa0abb
commit b76df0d609
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -24,6 +24,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- 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

2
tbl_change.php
View File

@@ -482,7 +482,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']) {
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;
}
}