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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-05-29 14:40:22 +02:00
parent 17a91b0f78 024120107c
commit b46331947f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/tbl_replace_fields.inc.php
View File

@@ -114,7 +114,7 @@ if (false !== $possibly_uploaded_val) {
$val = preg_replace('/[^01]/', '0', $val);
$val = "b'" . PMA_sqlAddslashes($val) . "'";
} elseif (! (($type == 'datetime' || $type == 'timestamp') && $val == 'CURRENT_TIMESTAMP')) {
$val = "'" . PMA_sqlAddslashes($val) . "' /*" . $type . " */";
$val = "'" . PMA_sqlAddslashes($val) . "'";
}
// Was the Null checkbox checked for this field?

2
tbl_change.php
View File

@@ -457,7 +457,7 @@ foreach ($rows as $row_id => $vrow) {
$special_chars = PMA_printable_bit_value($vrow[$field['Field']], $extracted_fieldspec['spec_in_brackets']);
} else {
// 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;