The branch, master has been updated
via 407054b6b147b2d877dc73a9f316045f3615172b (commit)
from 9ec14c786c2a6917c458198c1c256c3d534cbc8d (commit)
- Log -----------------------------------------------------------------
commit 407054b6b147b2d877dc73a9f316045f3615172b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Apr 29 07:44:30 2010 -0400
I do not see the reason for this condition, and it creates a problem so I remove it
-----------------------------------------------------------------------
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 3f42c40..79e3b6d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -458,7 +458,7 @@ foreach ($rows as $row_id => $vrow) {
} else {
// special binary "characters"
if ($field['is_binary'] || $field['is_blob']) {
- if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && !$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;
} else {
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 238f4997c5dc4ffddb98aad0534fe38867ee3587 (commit)
from 9b6695dff4470be94556776c0618ee4d8ff80e20 (commit)
- Log -----------------------------------------------------------------
commit 238f4997c5dc4ffddb98aad0534fe38867ee3587
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Apr 29 10:35:58 2010 +0200
Add link to wiki.
-----------------------------------------------------------------------
Summary of changes:
templates/improve.tpl | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/templates/improve.tpl b/templates/improve.tpl
index b39a09f..7a2e353 100644
--- a/templates/improve.tpl
+++ b/templates/improve.tpl
@@ -103,6 +103,8 @@ Standards should be obeyed in all cases when possible. Generated content
should be valid XHTML 1.0 and CSS. PHP code should match <a
href="http://pear.php.net/manual/en/standards.php">PEAR Coding Standards</a>
and documented using <a href="http://www.phpdoc.org/">phpDocumentator</a>.
+More information about coding is available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Coding_guidelines">
+our wiki</a>.
</p>
<h3>Developer Documentation</h3>
hooks/post-receive
--
phpMyAdmin website
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(a)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
The branch, QA_3_3 has been updated
via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit)
from 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit)
- Log -----------------------------------------------------------------
commit b76df0d6099704dad6414d4fe4aaccb6694b61a5
Author: Marc Delisle <marc(a)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