|
From: Jonathan H. <the...@us...> - 2002-03-06 21:23:54
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv10702/admin
Modified Files:
admin_users.php admin_db_utilities.php
Log Message:
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
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** admin_users.php 1 Mar 2002 18:04:27 -0000 1.47
--- admin_users.php 6 Mar 2002 21:23:51 -0000 1.48
***************
*** 984,988 ****
// 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']) )
{
$form_enctype = '';
--- 984,989 ----
// us from doing file uploads....
//
! $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 = '';
Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** admin_db_utilities.php 1 Mar 2002 17:40:20 -0000 1.36
--- admin_db_utilities.php 6 Mar 2002 21:23:51 -0000 1.37
***************
*** 33,37 ****
$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') )
{
$module['General']['Restore_DB'] = $filename . "?perform=restore";
--- 33,38 ----
$filename = basename(__FILE__);
$module['General']['Backup_DB'] = $filename . "?perform=backup";
! $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";
|