diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-18 15:21:22 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-18 15:21:22 +0000 |
| commit | ca1926c0326cd043c05eae452d9eac458ba21d36 (patch) | |
| tree | e23391b59ddb14eac3f91d5c6994329226396e7b | |
| parent | 6066b8a5b0f66a54613bc3c307f7fe7b729cdd4b (diff) | |
| download | forums-ca1926c0326cd043c05eae452d9eac458ba21d36.tar forums-ca1926c0326cd043c05eae452d9eac458ba21d36.tar.gz forums-ca1926c0326cd043c05eae452d9eac458ba21d36.tar.bz2 forums-ca1926c0326cd043c05eae452d9eac458ba21d36.tar.xz forums-ca1926c0326cd043c05eae452d9eac458ba21d36.zip | |
Fix for avatar gallery cancel appearing to delete avatar
git-svn-id: file:///svn/phpbb/trunk@2313 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/usercp_register.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php index da7be75ed6..0bbf9f7eef 100644 --- a/phpBB/includes/usercp_register.php +++ b/phpBB/includes/usercp_register.php @@ -193,8 +193,12 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery']) $user_lang = stripslashes($user_lang); $user_dateformat = stripslashes($user_dateformat); - $user_avatar = $user_avatar_local; - $user_avatar_type = USER_AVATAR_GALLERY; + + if ( !isset($HTTP_POST_VARS['cancelavatar'])) + { + $user_avatar = $user_avatar_local; + $user_avatar_type = USER_AVATAR_GALLERY; + } } } |