diff options
| -rw-r--r-- | phpBB/viewforum.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 5f25b89dbb..0100f5e94f 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -248,7 +248,7 @@ if ($forum_data['forum_type'] == FORUM_POST) 'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir", $topics_count, $config['topics_per_page'], $start), 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), 'TOTAL_TOPICS' => ($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count), - 'MOD_CP' => ($auth->acl_gets('m_', $forum_id)) ? sprintf($user->lang['MCP'], "<a href=\"mcp.$phpEx?sid=$user->session_id&f=$forum_id\">", '</a>') : '', + 'MOD_CP' => ($auth->acl_gets('m_', $forum_id)) ? sprintf($user->lang['MCP'], "<a href=\"mcp.$phpEx?sid=$user->session_id&f=$forum_id&mode=forum_view\">", '</a>') : '', 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', 'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('btn_locked', $post_alt) : $user->img('btn_post', $post_alt), @@ -263,8 +263,8 @@ if ($forum_data['forum_type'] == FORUM_POST) 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'POST_ANNOUNCEMENT'), 'FOLDER_ANNOUNCE_NEW_IMG'=> $user->img('folder_announce_new', 'POST_ANNOUNCEMENT'), - 'REPORTED_IMG' => $user->img('icon_reported', 'TOPIC_BEEN_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'TOPIC_NOT_BEEN_APPROVED'), + 'REPORTED_IMG' => $user->img('icon_reported', 'TOPIC_REPORTED'), + 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'), 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], @@ -314,7 +314,7 @@ if ($forum_data['forum_type'] == FORUM_POST) if ($start + $config['topics_per_page'] > $topics_count) { - $limit = min($config['topics_per_page'], max(0, $topics_count - $start)); + $limit = min($config['topics_per_page'], max(1, $topics_count - $start)); } $sql_sort_order = preg_replace('/(ASC|DESC)/e', "('\$1' == 'ASC') ? 'DESC' : 'ASC'", $sql_sort_order); |