aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/profile.php
diff options
context:
space:
mode:
authorthe_systech <the_systech@users.sourceforge.net>2002-03-01 18:04:27 +0000
committerthe_systech <the_systech@users.sourceforge.net>2002-03-01 18:04:27 +0000
commit89ceaa9975343ebc0ce817d64ad62a282c11beb9 (patch)
tree9ef0742ee39c12aba8a3798a795575c7c3d443c5 /phpBB/profile.php
parentebef1197964061ae2f2eb17dce2061fad1df6a35 (diff)
downloadforums-89ceaa9975343ebc0ce817d64ad62a282c11beb9.tar
forums-89ceaa9975343ebc0ce817d64ad62a282c11beb9.tar.gz
forums-89ceaa9975343ebc0ce817d64ad62a282c11beb9.tar.bz2
forums-89ceaa9975343ebc0ce817d64ad62a282c11beb9.tar.xz
forums-89ceaa9975343ebc0ce817d64ad62a282c11beb9.zip
Oops I did a Paul... Still allow avatar uploads from Urls
git-svn-id: file:///svn/phpbb/trunk@2243 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
-rw-r--r--phpBB/profile.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php
index b8e64e042e..74578fd6d6 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -1626,13 +1626,17 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
// of the templates to 'fake' an IF...ELSE...ENDIF solution
// it works well :)
//
- if( $userdata['user_allowavatar'] && ( ($board_config['allow_avatar_upload'] && $form_enctype != '') || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
+ if( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
{
$template->assign_block_vars("avatarblock", array() );
- if($board_config['allow_avatar_upload'] && file_exists("./" . $board_config['avatar_path']) && $form_enctype != '')
+ if($board_config['allow_avatar_upload'] && file_exists("./" . $board_config['avatar_path']))
{
$template->assign_block_vars("avatarblock.avatarupload", array() );
+ if( $form_enctype != '' )
+ {
+ $template->assign_block_vars("avatarblock.avatarupload.avatarfileupload", array() );
+ }
}
if($board_config['allow_avatar_remote'])