mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
Fixed: invalid start value will not cause the whole table to be returned ;)
git-svn-id: file:///svn/phpbb/trunk@4498 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
2d0e00653c
commit
c1b9ddb662
1 changed files with 4 additions and 4 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue