diff options
Diffstat (limited to 'phpBB/admin')
| -rw-r--r-- | phpBB/admin/admin_board.php | 8 | ||||
| -rw-r--r-- | phpBB/admin/admin_users.php | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 2c55f5fc2c..714d1b05f0 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -122,14 +122,6 @@ $smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; $template->set_filenames(array( "body" => "admin/board_config_body.tpl") ); -// -// Check to see if file uploads are possible before displaying -// avatar upload option. -// -if( (get_cfg_var('file_uploads') != 0) && (strtolower(get_cfg_var('file_uploads')) != 'off') && (phpversion() != '4.0.4pl1') ) -{ - $template->assign_block_vars('switch_uploads_possible', array()); -} // // Escape any quotes in the site description for proper display in the text diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index bbc9905fda..a9cf26b336 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -1107,6 +1107,10 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) | if( file_exists("./../" . $board_config['avatar_path']) ) { $template->assign_block_vars("avatarupload", array() ); + if($form_enctype != '') + { + $template->assign_block_vars('avatarupload.fileuploads', array() ); + } } if( file_exists("./../" . $board_config['avatar_gallery_path']) ) |