diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a6d014ef20..08089706f5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -32,6 +32,7 @@ p,ul,td {font-size:10pt;}
  1. Changelog
      2. +
    1. Changes since 2.0.17
    2. Changes since 2.0.16
    3. Changes since 2.0.15
    4. Changes since 2.0.14
      5. @@ -72,9 +73,11 @@ p,ul,td {font-size:10pt;}
    5. [Fix] improved handling of username lists in admin_ug_auth.php (Bug #98)
    6. [Fix] incorrect removal of bbcode_uid values if bbcode has been turned off (Bug #100)
    7. [Fix] correctly preview signature if editing other users posts (Bug #101)
      8. -
    8. [Fix] incorrect alt tag on generated search images in viewtopic.php and usercp_viewprofile.php (Bug #102)
      9. +
    9. [Fix] incorrect alt tag on generated search images in groupcp.php, viewtopic.php and usercp_viewprofile.php (Bug #102)
    10. [Fix] consistent forum ordering in all dropdown boxes (Bug #106)
    11. [Fix] correctly get compression status in page_tail.php and page_footer_admin.php (Bug #117)
      12. +
    12. [Fix] set page title on summary page of groupcp.php (bug #125)
      13. +
    13. [Fix] correctly test style and avatar in usercp_register.php (bug #129 and #317)
    14. [Fix] handling of both forms of translation information used in language packs (Bug #159)
    15. [Fix] key length for activation keys fixed in usercp_sendpassword.php (Bug #171)
    16. [Fix] use GENERAL_MESSAGE constant in message_die instead of MESSAGE (Bug #176)
      17. diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php index 735bb6e63c..05495a3760 100644 --- a/phpBB/includes/usercp_register.php +++ b/phpBB/includes/usercp_register.php @@ -199,8 +199,8 @@ if ( $user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0; $user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : ''; - $user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : ''; - $user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : ''; + $user_avatar = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : ''; + $user_avatar_type = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : ''; if ( (isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar'])) && (!isset($HTTP_POST_VARS['submit'])) ) { diff --git a/phpBB/login.php b/phpBB/login.php index 2e94b5defa..ff4ced929d 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -210,7 +210,7 @@ else $s_hidden_fields = ''; $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '' : ''; - make_jumpbox('viewforum.'.$phpEx, $forum_id); + make_jumpbox('viewforum.'.$phpEx); $template->assign_vars(array( 'USERNAME' => $username, diff --git a/phpBB/templates/subSilver/bbcode.tpl b/phpBB/templates/subSilver/bbcode.tpl index caef76b99e..6f86f55353 100755 --- a/phpBB/templates/subSilver/bbcode.tpl +++ b/phpBB/templates/subSilver/bbcode.tpl @@ -57,4 +57,4 @@ {DESCRIPTION} -{EMAIL} +{EMAIL}