diff --git a/ChangeLog b/ChangeLog index 919cc3e3c..9a40a9f27 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ $Source$ errors and removed "$strLogin" from the title of the login page. * tbl_properties.inc.php3, line 30: beautified the generated page. * lang/german.inc.php3: updated thanks to Alexander M. Turek. + * db_details.php3; tbl_properties.php3: tried to fix bug #494564 - No Sql + Query! (2 MB). 2002-02-09 Marc Delisle * main.php3, libraries/auth/cookie.auth.lib.php3, Patch diff --git a/db_details.php3 b/db_details.php3 index 564d5f61f..ebb1b7d8d 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -496,12 +496,17 @@ if ($num_tables > 0) { = 40000 && function_exists('ini_get')) + ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) + : (intval(@get_cfg_var('upload_max_filesize'))); ?>
  • -
    onsubmit="return checkSqlQuery(this)"> @@ -521,9 +526,6 @@ if ($num_tables > 0) { = 40000 && function_exists('ini_get')) - ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) - : (intval(@get_cfg_var('upload_max_filesize'))); if ($is_upload) { echo ' ' . $strOr . ' ' . $strLocationTextfile . ' :
    ' . "\n"; ?> diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 4faba5334..7f99c1915 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -681,6 +681,10 @@ echo "\n"; /** * Work on the table */ +// loic1: defines wether file upload is available or not +$is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get')) + ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) + : (intval(@get_cfg_var('upload_max_filesize'))); ?>
      @@ -693,7 +697,7 @@ echo "\n";
    • - onsubmit="return checkSqlQuery(this)"> @@ -714,9 +718,6 @@ echo "\n"; = 40000 && function_exists('ini_get')) - ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize'))) - : (intval(@get_cfg_var('upload_max_filesize'))); if ($is_upload) { echo ' ' . $strOr . ' ' . $strLocationTextfile . ' :
      ' . "\n"; ?>