diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 14:59:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 14:59:33 +0000 |
| commit | c0caf7652fb699ec38488df6f52f354534dd22d1 (patch) | |
| tree | 0f3673f0b38e905a95773b8b4b3b878139cc991e /phpBB | |
| parent | 929fa966708a022ec329e015f89b78c7894e7ff6 (diff) | |
| download | forums-c0caf7652fb699ec38488df6f52f354534dd22d1.tar forums-c0caf7652fb699ec38488df6f52f354534dd22d1.tar.gz forums-c0caf7652fb699ec38488df6f52f354534dd22d1.tar.bz2 forums-c0caf7652fb699ec38488df6f52f354534dd22d1.tar.xz forums-c0caf7652fb699ec38488df6f52f354534dd22d1.zip | |
Fixing some tiny bugs...
- correctly close span tags within code=php
git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
20 files changed, 39 insertions, 30 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 7d2b2c60b1..cee60b4185 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -243,8 +243,10 @@ <!-- ENDIF --> <tr> <td><strong>{groups.GROUP_NAME}</strong> - <!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>» {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF --> - <!-- IF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>» {L_ONLY_ALLOWED_IN_PM}</span><!-- ENDIF --> + <!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>» {L_NOT_ALLOWED_IN_PM}</span> + <!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>» {L_ONLY_ALLOWED_IN_PM}</span> + <!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>» {L_NOT_ALLOWED_IN_PM_POST}</span> + <!-- ELSE --><br /><span>» {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF --> </td> <td>{groups.CATEGORY}</td> <td align="center" valign="middle" style="white-space: nowrap;"> <a href="{groups.U_EDIT}">{ICON_EDIT}</a> <a href="{groups.U_DELETE}">{ICON_DELETE}</a> </td> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 47efd249ec..2b067cb292 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -384,6 +384,7 @@ | <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a> <!-- ENDIF --> </td> + </tr> <!-- END installed --> <tr> <td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td> diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index b35bfde649..4387e02739 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -16,7 +16,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) global $template, $db, $user, $auth, $cache, $module; global $phpEx, $phpbb_root_path, $config; - $user->add_lang('viewtopic'); + $user->add_lang(array('viewtopic', 'viewforum')); include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); @@ -120,8 +120,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'PAGINATION' => generate_pagination($url . "&i=$id&action=$action&mode=$mode" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start), 'PAGE_NUMBER' => on_page($forum_topics, $topics_per_page, $start), - 'TOTAL' => $forum_topics) - ); + 'TOTAL_TOPICS' => ($forum_topics == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $forum_topics), + )); // Grab icons $icons = $cache->obtain_icons(); diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 05f143a9c3..d5b4f8d422 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -173,6 +173,8 @@ class mcp_queue case 'unapproved_topics': case 'unapproved_posts': + $user->add_lang(array('viewtopic', 'viewforum')); + $topic_id = request_var('t', 0); $forum_info = array(); @@ -385,8 +387,8 @@ class mcp_queue 'PAGINATION' => generate_pagination($this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir", $total, $config['topics_per_page'], $start), 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), 'TOPIC_ID' => $topic_id, - 'TOTAL' => $total) - ); + 'TOTAL' => ($total == 1) ? (($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POST'] : $user->lang['VIEW_FORUM_TOPIC']) : sprintf((($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POSTS'] : $user->lang['VIEW_FORUM_TOPICS']), $total), + )); $this->tpl_name = 'mcp_queue'; break; diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 0ed6c05f88..3c49477ca2 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -137,7 +137,6 @@ function mcp_topic_view($id, $mode, $action) foreach ($rowset as $i => $row) { - $message = $row['post_text']; $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; $message = str_replace("\n", '<br />', $message); @@ -247,8 +246,8 @@ function mcp_topic_view($id, $mode, $action) 'PAGE_NUMBER' => on_page($total, $posts_per_page, $start), 'PAGINATION' => (!$posts_per_page) ? '' : generate_pagination(append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&t={$topic_info['topic_id']}&mode=$mode&action=$action&to_topic_id=$to_topic_id&posts_per_page=$posts_per_page&st=$sort_days&sk=$sort_key&sd=$sort_dir"), $total, $posts_per_page, $start), - 'TOTAL' => $total) - ); + 'TOTAL_POSTS' => ($total == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total), + )); } /** diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 532bc057ab..0969603999 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -404,7 +404,7 @@ class bbcode_firstpass extends bbcode if ($remove_tags) { - $code = preg_replace('#(<span class="[a-z]+">)?\?></span>#', '', $code); + $code = preg_replace('#(<span class="[a-z]+">)?\?>(</span>)#', '$1 $2', $code); } $code = preg_replace('#^<span class="[a-z]+"><span class="([a-z]+)">(.*)</span></span>#s', '<span class="$1">$2</span>', $code); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b59288a1b8..0eca81022f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -650,7 +650,7 @@ INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_heigh INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15, 26); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', 'Razz', 15, 15, 27); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', 'Razz', 15, 15, 28); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15, 29); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', 'Embarrassed', 15, 15, 29); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15, 30); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15, 31); INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15, 32); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 08ef23aaab..b9a352960a 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -40,6 +40,7 @@ $lang = array_merge($lang, array( 'ADMIN_UPLOAD_ERROR' => 'Errors while trying to attach file: “%s”.', 'ALLOWED_FORUMS' => 'Allowed forums', 'ALLOWED_FORUMS_EXPLAIN' => 'Able to post the assigned extensions at the selected (or all if selected) forums.', + 'ALLOWED_IN_PM_POST' => 'Allowed', 'ALLOW_ATTACHMENTS' => 'Allow attachments', 'ALLOW_ALL_FORUMS' => 'Allow all forums', 'ALLOW_IN_PM' => 'Allowed in private messaging', @@ -109,7 +110,8 @@ $lang = array_merge($lang, array( 'MODE_INLINE' => 'Inline', 'MODE_PHYSICAL' => 'Physical', - 'NOT_ALLOWED_IN_PM' => 'Not allowed in private messages', + 'NOT_ALLOWED_IN_PM' => 'Only allowed in posts', + 'NOT_ALLOWED_IN_PM_POST' => 'Not allowed', 'NOT_ASSIGNED' => 'Not assigned', 'NO_EXT_GROUP' => 'None', 'NO_EXT_GROUP_NAME' => 'No group name entered', diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 6bd3128bf9..7e48c19b65 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -36,7 +36,7 @@ $lang = array_merge($lang, array( '30_MINS' => '30 minutes', '6_HOURS' => '6 hours', - 'ACP_BAN_EXPLAIN' => 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -></span> for the ban length and enter a date in yyyy-mm-dd format.', + 'ACP_BAN_EXPLAIN' => 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -></span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.', 'BAN_EXCLUDE' => 'Exclude from banning', 'BAN_LENGTH' => 'Length of ban', @@ -59,7 +59,7 @@ $lang = array_merge($lang, array( 'IP_UNBAN' => 'Un-ban or un-exclude IPs', 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.', - 'LENGTH_BAN_INVALID' => 'The date has to be formated YYYY-MM-DD', + 'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.', 'PERMANENT' => 'Permanent', diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 95ef0444c1..c831a87981 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -31,7 +31,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups, you can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description.', + 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups, you can delete, create and edit existing groups. You may choose group leaders, toggle open/closed group status and set the group name and description.', 'ADD_USERS' => 'Add users', 'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 486931fda8..765be3b6a0 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -161,7 +161,7 @@ $lang = array_merge($lang, array( 'FINAL_STEP' => 'Processing final step', 'FORUM_ADDRESS' => 'Board address', 'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.', - 'FORUM_PATH' => 'Forum path', + 'FORUM_PATH' => 'Board path', 'FORUM_PATH_EXPLAIN' => 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of your phpBB installation</strong>.', 'FOUND' => 'Found', 'FTP_CONFIG' => 'Transfer config by FTP', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index b7cd3178ca..480a95c392 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -79,6 +79,7 @@ $lang = array_merge($lang, array( 'DISABLE_SMILIES' => 'Disable smilies', 'DISALLOWED_EXTENSION' => 'The extension %s is not allowed.', 'DRAFT_LOADED' => 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.', + 'DRAFT_LOADED_PM' => 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.', 'DRAFT_SAVED' => 'Draft successfully saved.', 'DRAFT_TITLE' => 'Draft title', diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index d702e88ea4..a2888610da 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -4,7 +4,9 @@ <!-- IF U_MCP --><p> [ <a href="{U_MCP}">{L_MCP}</a> ]</p><!-- ENDIF --> <ul class="linklist"> - <li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> • <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> • <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li> + <!-- IF S_DISPLAY_SEARCH --> + <li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_USER_LOGGED_IN --> • <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> • <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li> + <!-- ENDIF --> <!-- IF S_USER_LOGGED_IN and not S_IS_BOT --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF --> </ul> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 86889d35ea..d05f9401ff 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -10,10 +10,10 @@ <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> - <!-- IF PAGINATION or TOTAL --> + <!-- IF PAGINATION or TOTAL_TOPICS --> <ul class="linklist"> <li class="rightside pagination"> - <!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF --> + <!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF --> <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> @@ -70,10 +70,10 @@ <hr /> - <!-- IF PAGINATION or TOTAL --> + <!-- IF PAGINATION or TOTAL_TOPICS --> <ul class="linklist"> <li class="rightside pagination"> - <!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF --> + <!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS}<!-- ENDIF --> <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index b762c393eb..096ed8243a 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -17,7 +17,7 @@ <!-- IF .postrow --> <ul class="linklist"> <li class="rightside pagination"> - <!-- IF TOTAL --> {TOTAL} {L_TOPICS}<!-- ENDIF --> + <!-- IF TOTAL --> {TOTAL}<!-- ENDIF --> <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> @@ -72,7 +72,7 @@ <ul class="linklist"> <li class="rightside pagination"> - <!-- IF TOTAL -->{TOTAL} {L_TOPICS}<!-- ENDIF --> + <!-- IF TOTAL -->{TOTAL}<!-- ENDIF --> <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 256c83fb37..f27ab7f5d0 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -129,10 +129,10 @@ onload_functions.push('subPanels()'); <hr /> - <!-- IF PAGINATION or TOTAL --> + <!-- IF PAGINATION or TOTAL_POSTS --> <ul class="linklist"> <li class="rightside pagination"> - <!-- IF TOTAL --> {TOTAL} {L_POSTS}<!-- ENDIF --> + <!-- IF TOTAL_POSTS --> {TOTAL_POSTS}<!-- ENDIF --> <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 5404d8b4ff..bb5ca7e35b 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -106,7 +106,7 @@ <p style="display: none;"><a href="#start_here">{L_SKIP}</a></p> </div> - <!-- IF not S_IN_SEARCH --> + <!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> <div id="search-box"> <form action="{U_SEARCH}" method="get" id="search"> <fieldset> diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index a77870992b..378c632858 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -5,7 +5,7 @@ <div class="inner"><span class="corners-top"><span></span></span> <h3>{L_INFORMATION}</h3> - <p>{L_DRAFT_LOADED}</p> + <p>{L_DRAFT_LOADED_PM}</p> <span class="corners-bottom"><span></span></span></div> </div> diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html index 790c093be6..3105c15ae4 100644 --- a/phpBB/styles/subsilver2/template/mcp_footer.html +++ b/phpBB/styles/subsilver2/template/mcp_footer.html @@ -7,7 +7,7 @@ <table width="80%" align="{S_CONTENT_FLOW_END}" cellspacing="1"> <tr> <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> - <td class="gensmall" nowrap="nowrap"> [ {TOTAL} ] </td> + <td class="gensmall" nowrap="nowrap"> [ <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ELSEIF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ELSE -->{TOTAL}<!-- ENDIF --> ] </td> <td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td> </tr> </table> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 492bd445a7..e8d6332c9f 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -43,7 +43,7 @@ <th align="center">{L_INFORMATION}</th> </tr> <tr> - <td class="row1" align="center"><span class="gen">{L_DRAFT_LOADED}</span></td> + <td class="row1" align="center"><span class="gen"><!-- IF S_PRIVMSGS -->{L_DRAFT_LOADED_PM}<!-- ELSE -->{L_DRAFT_LOADED}<!-- ENDIF --></span></td> </tr> </table> |