diff --git a/ChangeLog b/ChangeLog index 6e06430a2..32e86a913 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-02-16 Michal Cihar + * tbl_change.php3, tbl_replace_fields.php3: Removed checkbox for binary + upload, upload field moved into table. + 2003-02-17 Marc Delisle ### 2.4.0-rc2 released diff --git a/tbl_change.php3 b/tbl_change.php3 index e1b50fade..06fe3f76f 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -533,7 +533,6 @@ for ($i = 0; $i < $fields_cnt; $i++) { echo "\n"; ?> - - "> ="return unNullify('')" tabindex="" id="field__3" /> - '; - echo ''; - echo ''; - echo '(' . $strDocu . ')'; - echo ''; + echo ''; } + echo ''; } // end else if ( binary or blob) else { diff --git a/tbl_replace_fields.php3 b/tbl_replace_fields.php3 index a174673b1..374ed4915 100755 --- a/tbl_replace_fields.php3 +++ b/tbl_replace_fields.php3 @@ -10,18 +10,11 @@ if (isset(${"fields_upload_" . $key}) && !empty(${"fields_upload_" . $key}) && ${"fields_upload_" . $key} != 'none') { $data_file = ${"fields_upload_" . $key}; $val = fread(fopen($data_file, "rb"), filesize($data_file)); - if (isset(${"fields_upload_binary_" . $key})) { - // nijel: This is probably the best way how to put binary data - // into MySQL and it also allow not to care about charset - // conversion that would otherwise corrupt the data. - $val = '0x' . bin2hex($val); - $seen_binary = TRUE; - } else { - // must always add slashes for an uploaded file: - // - do not use PMA_sqlAddslashes() - // - do not check get_magic_quotes_gpc() - $val = "'" . addslashes($val) . "'"; - } + // nijel: This is probably the best way how to put binary data + // into MySQL and it also allow not to care about charset + // conversion that would otherwise corrupt the data. + $val = '0x' . bin2hex($val); + $seen_binary = TRUE; } else { // f i e l d v a l u e i n t h e f o r m