fixed warnings and a parse error

This commit is contained in:
Loïc Chapeaux
2002-02-24 19:10:33 +00:00
parent b106eb60d1
commit e3be56f88d
3 changed files with 4 additions and 2 deletions

View File

@@ -31,7 +31,7 @@ if (isset($btnLDI) && ($textfile != 'none')) {
// Kanji encoding convert appended by Y.Kawada
if (function_exists('PMA_kanji_file_conv')) {
$textfile = PMA_kanji_file_conv($textfile, $knjenc, $xkana);
$textfile = PMA_kanji_file_conv($textfile, $knjenc, isset($xkana) ? $xkana : '');
}
// Formats the data posted to this script
$textfile = PMA_sqlAddslashes($textfile);

View File

@@ -66,6 +66,7 @@ if (function_exists('PMA_set_enc_form')) {
. PMA_set_enc_form(' ')
. ' </td>' . "\n"
. ' </tr>' . "\n";
} // end if
?>
<tr>
<td colspan="3" align="center"><?php print PMA_showDocuShort('L/O/LOAD_DATA.html'); ?></td>

View File

@@ -265,7 +265,8 @@ else {
}
// tmpfile remove after convert encoding appended by Y.Kawada
if (function_exists('PMA_kanji_file_conv') && file_exists($textfile)) {
if (function_exists('PMA_kanji_file_conv')
&& (isset($textfile) && file_exists($textfile))) {
unlink($textfile);
}