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

fix mistake in merge

Browse Source
This commit is contained in:
Dieter Adriaenssens
2010-03-17 22:50:27 +01:00
parent 27a56224ff
commit c7c77f9744
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tbl_change.php
View File

@@ -462,11 +462,7 @@ foreach ($rows as $row_id => $vrow) {
. htmlspecialchars($vrow[$field['Field']]) . '" />'; . htmlspecialchars($vrow[$field['Field']]) . '" />';
} else { } else {
// (we are inserting) // (we are inserting)
<<<<<<< HEAD
// display default values // display default values
=======
// loic1: display default values
>>>>>>> QA_3_3
if (!isset($field['Default'])) { if (!isset($field['Default'])) {
$field['Default'] = ''; $field['Default'] = '';
$real_null_value = TRUE; $real_null_value = TRUE;
@@ -482,11 +478,7 @@ foreach ($rows as $row_id => $vrow) {
$backup_field = ''; $backup_field = '';
$special_chars_encoded = PMA_duplicateFirstNewline($special_chars); $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
// this will select the UNHEX function while inserting // this will select the UNHEX function while inserting
<<<<<<< HEAD
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']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) {
=======
if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
>>>>>>> QA_3_3
$field['display_binary_as_hex'] = true; $field['display_binary_as_hex'] = true;
} }
} }