[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-27-gb76df0d
Marc Delisle
lem9 at users.sourceforge.net
Wed Apr 28 19:06:35 CEST 2010
The branch, QA_3_3 has been updated
via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit)
from 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit)
- Log -----------------------------------------------------------------
commit b76df0d6099704dad6414d4fe4aaccb6694b61a5
Author: Marc Delisle <marc at infomarc.info>
Date: Wed Apr 28 13:06:09 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 46a7f1c..e5064bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/tbl_change.php b/tbl_change.php
index f8cc1c0..d7b86dd 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -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;
}
}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list