diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
4 files changed, 10 insertions, 9 deletions
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); |