1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +02:00

Minor screw up in file upload checking.. If file_uploads is not set at all in the php.ini file then the check for get_cfg_var('file_uploads') == 0 would return true and say it was disabled, when in actuallity it was enabled.. Now check for it to empty as well... Empty as my head that is :D

git-svn-id: file:///svn/phpbb/trunk@2277 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
the_systech 2002-03-06 21:23:51 +00:00
parent f00941114a
commit 2f882026ef
3 changed files with 7 additions and 4 deletions

View File

@ -32,7 +32,8 @@ if( !empty($setmodules) )
{
$filename = basename(__FILE__);
$module['General']['Backup_DB'] = $filename . "?perform=backup";
if( (get_cfg_var('file_uploads') != 0) && (strtolower(get_cfg_var('file_uploads')) != 'off') && (phpversion() != '4.0.4pl1') )
$file_uploads = get_cfg_var('file_uploads');
if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (phpversion() != '4.0.4pl1') )
{
$module['General']['Restore_DB'] = $filename . "?perform=restore";
}

View File

@ -983,7 +983,8 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
// Let's do an overall check for settings/versions which would prevent
// us from doing file uploads....
//
if( (get_cfg_var('file_uploads') == 0) || (strtolower(get_cfg_var('file_uploads')) == 'off') || (phpversion() == '4.0.4pl1') || (!$board_config['allow_avatar_upload']) )
$file_uploads = get_cfg_var('file_uploads');
if( ($file_uploads == 0 && !empty($file_uploads)) || (strtolower($file_uploads) == 'off') || (phpversion() == '4.0.4pl1') || (!$board_config['allow_avatar_upload']) )
{
$form_enctype = '';
}

View File

@ -1493,7 +1493,8 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
// Let's do an overall check for settings/versions which would prevent
// us from doing file uploads....
//
if( (get_cfg_var('file_uploads') == 0) || (strtolower(get_cfg_var('file_uploads')) == 'off')|| (phpversion() == '4.0.4pl1') || (!$board_config['allow_avatar_upload']) )
$file_uploads = get_cfg_var('file_uploads');
if( ($file_uploads == 0 && !empty($file_uploads)) || (strtolower($file_uploads) == 'off')|| (phpversion() == '4.0.4pl1') || (!$board_config['allow_avatar_upload']) )
{
$form_enctype = '';
}
@ -2002,4 +2003,4 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
}
}
?>
?>