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

bug 614669

Browse Source
This commit is contained in:
Marc Delisle 2002-09-27 01:55:15 +00:00
parent 800a0c6f72
commit 91981eb10e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -5,10 +5,14 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-09-26 Marc Delisle <lem9@users.sourceforge.net>
* config.inc.php3, libraries/config_import.lib.php3: let UploadDir
empty because this means to not use the feature, thanks to Loïc
2002-09-25 Marc Delisle <lem9@users.sourceforge.net>
* read_dump.php3: bug 611970, do not display the imported query
if larger than 500 (I don't think it's necessary to add another
config variable), thanks to Loïc
config variable), thanks to Loïc
2002-09-24 Marc Delisle <lem9@users.sourceforge.net>
* sql.php3: could not go to next page when browsing a query containing

3
config.inc.php3
View File

@ -365,7 +365,7 @@ $cfg['SQLQuery']['Validate'] = FALSE; // Validate a query (see $cfg['SQLVa
/**
* web-server upload directory
*/
$cfg['UploadDir'] = './upload/'; // end with a slash
$cfg['UploadDir'] = ''; // for example, './upload/'; you must end it with a slash, and you leave it empty for no upload directory
/**
* SQL Parser Settings
@ -488,7 +488,6 @@ if ($cfg['ShowFunctionFields']) {
*/
set_magic_quotes_runtime(0);
/**
* File Revision - do not change either!
*/

7
libraries/config_import.lib.php3
View File

@ -617,9 +617,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
$cfg['SQLQuery']['Validate'] = FALSE;
}
if (!isset($cfg['UploadDir'])) {
$cfg['UploadDir'] = './upload/';
}
// do not set a value here, an empty value means to not use the feature
// if (!isset($cfg['UploadDir'])) {
// $cfg['UploadDir'] = './upload/';
// }
if (!isset($cfg['SQLValidator']['use'])) {
$cfg['SQLValidator']['use'] = FALSE;