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

bug #1817224 [import] Incorrect detection of file_uploads in some cases

Browse Source
This commit is contained in:
Marc Delisle
2007-11-05 12:24:13 +00:00
parent d6da079aaf
commit 8b67c1819b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -22,6 +22,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- wrong default charset in case of broken session - wrong default charset in case of broken session
- bug #1824506 [profiling] Profile command repeated on older MySQL servers - bug #1824506 [profiling] Profile command repeated on older MySQL servers
- bug #1825172 [export] Exporting and functions - bug #1825172 [export] Exporting and functions
- bug #1817224 [import] Incorrect detection of file_uploads in some cases,
thanks to Juergen Wind
2.11.2.0 (2007-10-27) 2.11.2.0 (2007-10-27)
- patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard - patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard

10
libraries/Config.class.php
View File

@@ -745,11 +745,17 @@ class PMA_Config
* checks if upload is enabled * checks if upload is enabled
* *
*/ */
function checkUpload() function checkUpload()
{ {
if (ini_get('file_uploads')) {
$this->set('enable_upload', true); $this->set('enable_upload', true);
if (strtolower(@ini_get('file_uploads')) == 'off' // if set "php_admin_value file_uploads Off" in httpd.conf
|| @ini_get('file_uploads') == 0) { // ini_get() also returns the string "Off" in this case:
if ('off' == strtolower(ini_get('file_uploads'))) {
$this->set('enable_upload', false);
}
} else {
$this->set('enable_upload', false); $this->set('enable_upload', false);
} }
} }