3 files changed, 24 insertions, 3 deletions
diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index 84340f8b05..72b019b56f 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -32,7 +32,14 @@ if( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['General']['Backup_DB'] = $filename . "?perform=backup";
-	$file_uploads = get_cfg_var('file_uploads');
+	if(phpversion() >= '4.0.0')
+	{	
+		$file_uploads = ini_get('file_uploads');
+	}
+	else
+	{
+		$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";
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 5da3131b2e..191bc2b496 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -983,7 +983,14 @@ 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....
 		//
-		$file_uploads = get_cfg_var('file_uploads');
+		if(phpversion() >= '4.0.0')
+		{
+			$file_uploads = ini_get('file_uploads');
+		}
+		else
+		{
+			$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 = '';
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 34745ac5ec..b0a584b6c3 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -1493,7 +1493,14 @@ 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....
 			//
-			$file_uploads = get_cfg_var('file_uploads');
+			if( phpversion() >= '4.0.0 )
+			{
+				$file_uploads = ini_get('file_uploads');
+			}
+			else
+			{
+				$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 = '';