diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 6cc703a5a7..eaa7d3bf7a 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -161,7 +161,7 @@

{L_FORUM_PASSWORD_EXPLAIN}
-
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 5c3d0077b6..e14e622080 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -129,7 +129,7 @@
{S_HIDDEN_FIELDS} - +
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index dd6e615df2..6b361ec3f1 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -22,7 +22,7 @@

{L_UPDATE_INSTALLATION_EXPLAIN}

- +
@@ -100,8 +100,6 @@

{L_PERFORM_DATABASE_UPDATE_EXPLAIN}
-
- » {L_RUN_DATABASE_SCRIPT} «



@@ -109,7 +107,9 @@
- + {L_RUN_DATABASE_SCRIPT} + +
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 2fd8142279..794d285574 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -35,7 +35,7 @@ function resize_panel() -

{L_SKIP}

+
+
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a4e629bbaa..10c2738c1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -249,8 +249,11 @@ p a {
  • [Fix] Correctly move pm's into folders if more than one is received (Bug #12135)
  • [Fix] Corrected various bugs with CPF on multi-language boards (Bug #11803)
  • [Fix] Disable notify checkbox in posting editor when board email is disabled (Bug #12263)
    • +
  • [Fix] Removed maxlength from password/username fields (Bugs #12215, #11797)
    • +
  • [Fix] Use icon-unsubscribe in prosilver (Bug #12211)
    • +
  • [Fix] Seperated PREVIOUS/NEXT language vars for pagination and next/previous step (Bug #12197)
    • +
  • [Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy
    • - diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 2fdbdbdbd1..99d7831390 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -1,10 +1,10 @@ $parent_data) + if (!empty($forum_parents)) { - list($parent_name, $parent_type) = array_values($parent_data); - - // Skip this parent if the user does not have the permission to view it - if (!$auth->acl_get('f_list', $parent_forum_id)) + foreach ($forum_parents as $parent_forum_id => $parent_data) { - continue; - } + list($parent_name, $parent_type) = array_values($parent_data); - $template->assign_block_vars('navlinks', array( - 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, - 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, - 'FORUM_NAME' => $parent_name, - 'FORUM_ID' => $parent_forum_id, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id)) - ); + // Skip this parent if the user does not have the permission to view it + if (!$auth->acl_get('f_list', $parent_forum_id)) + { + continue; + } + + $template->assign_block_vars('navlinks', array( + 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, + 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, + 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, + 'FORUM_NAME' => $parent_name, + 'FORUM_ID' => $parent_forum_id, + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id)) + ); + } } $template->assign_block_vars('navlinks', array( @@ -1057,6 +1060,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $for { $s_watching['link'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start"); $s_watching['title'] = $user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; + $s_watching['is_watching'] = $is_watching; } return; diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index bf82802a29..61ac1883b3 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -1,10 +1,10 @@ (string) $message_parser->message, - 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, + 'user_sig' => (string) $message_parser->message, + 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, 'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield ); @@ -491,7 +491,7 @@ class ucp_profile 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']), - 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], + 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'], 'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false, 'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false, diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 99fe3d9427..0a1409041b 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -1,10 +1,10 @@

    -

    ">»

    +

    " class="button1">

    assign_vars(array( 'TITLE' => $lang['INSTALL_INTRO'], 'BODY' => $lang['INSTALL_INTRO_BODY'], - 'L_SUBMIT' => $lang['NEXT'], + 'L_SUBMIT' => $lang['NEXT_STEP'], 'S_LANG_SELECT' => '', 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language", )); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 9f08f2ec64..a7f288bc0b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -108,6 +108,9 @@ class install_update extends module } $db->sql_freeresult($result); + // Force template recompile + $config['load_tplcompile'] = 1; + // First of all, init the user session $user->session_begin(); $auth->acl($user->data); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 2c8d60565e..74a80c5047 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -1,12 +1,12 @@ 'Here you are able to define session and login related settings.', 'ALL' => 'All', - 'ALLOW_AUTOLOGIN' => 'Allow persistent logins', - 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.', - 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)', - 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.', + 'ALLOW_AUTOLOGIN' => 'Allow persistent logins', + 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.', + 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)', + 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.', 'BROWSER_VALID' => 'Validate browser', 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.', 'CHECK_DNSBL' => 'Check IP against DNS Blackhole List', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 64de2e9ed7..aada3a4ee0 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -1,12 +1,12 @@ 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 9ae307233d..24e7b732f2 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -1,12 +1,12 @@ '%d new messages', 'NEW_POST' => 'New post', 'NEW_POSTS' => 'New posts', - 'NEXT' => 'Next', + 'NEXT' => 'Next', // Used in pagination + 'NEXT_STEP' => 'Next', 'NEVER' => 'Never', 'NO' => 'No', 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.', @@ -412,7 +413,8 @@ $lang = array_merge($lang, array( 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED' => 'This post is waiting for approval', 'PREVIEW' => 'Preview', - 'PREVIOUS' => 'Previous', + 'PREVIOUS' => 'Previous', // Used in pagination + 'PREVIOUS_STEP' => 'Previous', 'PRIVACY' => 'Privacy policy', 'PRIVATE_MESSAGE' => 'Private message', 'PRIVATE_MESSAGES' => 'Private messages', diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index a407f7f4d0..2681dc32cc 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -1,12 +1,12 @@ 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', 'PERFORM_DATABASE_UPDATE' => 'Perform database update', - 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After you performed the database update just follow the link presented to continue the update process.', + 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update had been performed just follow the link presented to continue the update process.', 'PREVIOUS_VERSION' => 'Previous version', 'PROGRESS' => 'Progress', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 5b4e239952..087e8997e5 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -1,12 +1,12 @@
    {LOGIN_ERROR}
    -
    +
    -
    +
    {L_FORGOT_PASS}
    {L_RESEND_ACTIVATION}
    diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 46544339f5..6d388da120 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -18,7 +18,7 @@
    -
    +
     
    diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 704624b993..52d815eb8e 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -67,7 +67,7 @@ onload_functions.push('subPanels()');
    -
    +
    diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 137c4939f4..cb5bf8d4ea 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -45,7 +45,7 @@ function checkForm(formObj)
    -
    +
    @@ -54,7 +54,7 @@ function checkForm(formObj)
    -
    +

    diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 96d165228e..b12d5314c7 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -19,7 +19,7 @@
    -
    +
    diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 4f37fbda1b..ac7ac9821d 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -51,7 +51,7 @@ function insert_single(user)
    -
    +
    diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index d56102f0bf..19fd7ad3eb 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -9,8 +9,8 @@
  • {L_INDEX} - {S_WATCH_FORUM_TITLE} - {L_WATCH_TOPIC} + class="icon-unsubscribe"class="icon-subscribe" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE} + class="icon-unsubscribe"class="icon-subscribe">{L_WATCH_TOPIC} {L_BOOKMARK_TOPIC} {L_BUMP_TOPIC} diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index fde14662a2..7ce6f86dea 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -48,7 +48,7 @@ -
    +
    • @@ -86,7 +86,7 @@
    -
    +
    @@ -250,7 +250,7 @@
    -
    +
    diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index 8e2626a29a..e8ecf2c306 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -28,32 +28,32 @@
    for="check_option">{L_IF}:
    - {CHECK_CURRENT} + {CHECK_CURRENT}
    -
    -
    {RULE_CURRENT}
    +
    +
    {RULE_CURRENT}
    -
    +
    -  [ {L_FIND_USERNAME} ] +  [ {L_FIND_USERNAME} ] {L_NO_GROUPS} - + {COND_CURRENT} @@ -68,7 +68,7 @@
    -
    +
    {ACTION_CURRENT}
    diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 269582d847..a7009ecf23 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -14,16 +14,16 @@

    {ERROR}


    {L_USERNAME_EXPLAIN}
    -
    {USERNAME}
    +
    {USERNAME}
    -
    {EMAIL}
    +
    {EMAIL}

    {L_CONFIRM_EMAIL_EXPLAIN}
    -
    +
    diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 5bb55c66f8..e9e17fc2cf 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -31,23 +31,23 @@

    {L_USERNAME_EXPLAIN}
    -
    +
    -
    +
    -
    +

    {L_PASSWORD_EXPLAIN}
    -
    +
    -
    +
    diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index 971bc36344..5114e4dec8 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -11,11 +11,11 @@
    -
    +

    {L_EMAIL_REMIND}
    -
    +
     
    diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 01e8312bc8..a1d3d5c193 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -12,11 +12,11 @@
    -
    +

    {L_EMAIL_REMIND}
    -
    +
     
    diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index ab50f0017d..e92a359ca8 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -90,11 +90,11 @@
    -
    +
    -
    +
    diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 7243c983fe..2462914756 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -35,7 +35,7 @@ style="width: 50%; text-align: {S_CONTENT_FLOW_END};">{L_USERNAME}: - +
    {L_REGISTER} @@ -44,7 +44,7 @@ style="width: 50%; text-align: {S_CONTENT_FLOW_END};">{L_PASSWORD}: - +
    {L_FORGOT_PASS}
    {L_RESEND_ACTIVATION} diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html index 06a26666e7..0ede67154e 100644 --- a/phpBB/styles/subsilver2/template/login_forum.html +++ b/phpBB/styles/subsilver2/template/login_forum.html @@ -22,7 +22,7 @@ {L_PASSWORD}: - + diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html index b374773f65..663da412f7 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_front.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_front.html @@ -8,7 +8,7 @@ {L_FIND_USERNAME}:
    [ {L_FIND_USERNAME} ] - + diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index b73190cffa..5cf4ac5ca6 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -12,7 +12,7 @@ {L_SPLIT_SUBJECT} - + {L_SPLIT_FORUM} diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html index 087e9124ff..b8322fe669 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html @@ -8,7 +8,7 @@ {L_FIND_USERNAME}:
    [ {L_FIND_USERNAME} ] - + diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html index 92df7910a5..9e74ec5335 100644 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ b/phpBB/styles/subsilver2/template/memberlist_email.html @@ -47,7 +47,7 @@ function checkForm(formObj) {L_SUBJECT} - + @@ -56,7 +56,7 @@ function checkForm(formObj) {L_REAL_NAME} - + {L_DEST_LANG}
    {L_DEST_LANG_EXPLAIN} diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 76d6ea85f9..7a803f5e7d 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -137,7 +137,7 @@ {L_USERNAME}: - + @@ -329,7 +329,7 @@ {L_EDIT_REASON}: - + diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index eda483e48f..61b5bd9da0 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -89,7 +89,7 @@ - colspan="2"> + colspan="2"> {L_FONT_COLOR} diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html index 6ade3a5745..d4dafbb71b 100644 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ b/phpBB/styles/subsilver2/template/ucp_header.html @@ -19,7 +19,7 @@ -   +   diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html index 4802b06720..a2a95826fd 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html @@ -22,27 +22,27 @@ {L_IF}: {CHECK_CURRENT} -   +   -   +   {RULE_CURRENT} -   +   -   +   -  [ {L_FIND_USERNAME} ] +  [ {L_FIND_USERNAME} ] {L_NO_GROUPS} @@ -51,7 +51,7 @@ -   +   @@ -61,7 +61,7 @@ -   +   {ACTION_CURRENT}   diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html index 6ade4c8cba..eed1efcb64 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html @@ -16,16 +16,16 @@ {L_USERNAME}:
    {L_USERNAME_EXPLAIN} - {USERNAME} + {USERNAME} {L_EMAIL_ADDRESS}: - {EMAIL} + {EMAIL} {L_CONFIRM_EMAIL}:
    {L_CONFIRM_EMAIL_EXPLAIN} - + diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 870c2ae1c7..171b017633 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -39,23 +39,23 @@ {L_USERNAME}:
    {L_USERNAME_EXPLAIN} - + {L_EMAIL_ADDRESS}: - + {L_CONFIRM_EMAIL}: - + {L_PASSWORD}:
    {L_PASSWORD_EXPLAIN} - + {L_CONFIRM_PASSWORD}: - + {L_LANGUAGE}: diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html index 47baf1d447..cf724c3f42 100644 --- a/phpBB/styles/subsilver2/template/ucp_remind.html +++ b/phpBB/styles/subsilver2/template/ucp_remind.html @@ -10,11 +10,11 @@ {L_USERNAME}: - + {L_EMAIL_ADDRESS}:
    {L_EMAIL_REMIND} - + {S_HIDDEN_FIELDS}   diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html index df72b523bc..08b6c6c22a 100644 --- a/phpBB/styles/subsilver2/template/ucp_resend.html +++ b/phpBB/styles/subsilver2/template/ucp_resend.html @@ -10,7 +10,7 @@ {L_USERNAME}: - + {L_EMAIL_ADDRESS}:
    {L_EMAIL_REMIND} diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7bad55b34f..00a302cef4 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -190,6 +190,8 @@ if ($forum_data['prune_next'] < time() && $forum_data['enable_prune']) // Forum rules and subscription info $s_watching_forum = $s_watching_forum_img = array(); $s_watching_forum['link'] = $s_watching_forum['title'] = ''; +$s_watching_forum['is_watching'] = false; + if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) { $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; @@ -281,6 +283,7 @@ $template->assign_vars(array( 'S_TOPIC_ICONS' => ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false), 'S_WATCH_FORUM_LINK' => $s_watching_forum['link'], 'S_WATCH_FORUM_TITLE' => $s_watching_forum['title'], + 'S_WATCHING_FORUM' => $s_watching_forum['is_watching'], 'S_FORUM_ACTION' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 98d852737e..e65388d35e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -428,6 +428,8 @@ $viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&a // Are we watching this topic? $s_watching_topic = $s_watching_topic_img = array(); $s_watching_topic['link'] = $s_watching_topic['title'] = ''; +$s_watching_topic['is_watching'] = false; + if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) { watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); @@ -574,6 +576,7 @@ $template->assign_vars(array( 'U_WATCH_TOPIC' => $s_watching_topic['link'], 'L_WATCH_TOPIC' => $s_watching_topic['title'], + 'S_WATCHING_TOPIC' => $s_watching_topic['is_watching'], 'U_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', 'L_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks'] && $topic_data['bookmarked']) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'],