mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 06:55:25 +02:00
Code Issues Releases Wiki Activity

ok, try to fix a bug introduced by fixing bug #8388

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7133 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-03-06 11:22:43 +00:00
parent 770e35d27e
commit 1070cf800f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/viewforum.php
View File

@ -405,7 +405,8 @@ $sql_array = array(
// the number of stickies are not known // the number of stickies are not known
$sql = $db->sql_build_query('SELECT', $sql_array); $sql = $db->sql_build_query('SELECT', $sql_array);
$sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_NORMAL : POST_STICKY, $sql); $sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_NORMAL : POST_STICKY, $sql);
$result = $db->sql_query_limit($sql, $sql_limit);
$result = ($store_reverse) ? $db->sql_query_limit($sql, $sql_limit, $sql_start) : $db->sql_query_limit($sql, $sql_limit);
$shadow_topic_list = array(); $shadow_topic_list = array();
@ -419,7 +420,7 @@ while ($row = $db->sql_fetchrow($result))
{ {
$start_count++; $start_count++;
if ($start_count >= $sql_start) if ((!$store_reverse && $start_count >= $sql_start) || $store_reverse)
{ {
if ($row['topic_status'] == ITEM_MOVED) if ($row['topic_status'] == ITEM_MOVED)
{ {
@ -439,8 +440,15 @@ if ($num_rows < $sql_limit)
$sql = $db->sql_build_query('SELECT', $sql_array); $sql = $db->sql_build_query('SELECT', $sql_array);
$sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_STICKY : POST_NORMAL, $sql); $sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_STICKY : POST_NORMAL, $sql);
if (!$store_reverse)
{
// Start at $sql_start - number of sticky topics on the previous page ($start_count - $num_rows) // Start at $sql_start - number of sticky topics on the previous page ($start_count - $num_rows)
$result = $db->sql_query_limit($sql, $sql_limit - $num_rows, $sql_start - ($start_count - $num_rows)); $result = $db->sql_query_limit($sql, $sql_limit - $num_rows, $sql_start - ($start_count - $num_rows));
}
else
{
$result = $db->sql_query_limit($sql, $sql_limit - $num_rows, $sql_start);
}
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {