From 1070cf800fd9a101a50bb89fe9c6571e5651ef72 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 6 Mar 2007 11:22:43 +0000
Subject: [PATCH] ok, try to fix a bug introduced by fixing bug #8388

git-svn-id: file:///svn/phpbb/trunk@7133 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewforum.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index b5b04c6a00..6b21d014b3 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -405,7 +405,8 @@ $sql_array = array(
 // the number of stickies are not known
 $sql = $db->sql_build_query('SELECT', $sql_array);
 $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();
 
@@ -419,7 +420,7 @@ while ($row = $db->sql_fetchrow($result))
 {
 	$start_count++;
 
-	if ($start_count >= $sql_start)
+	if ((!$store_reverse && $start_count >= $sql_start) || $store_reverse)
 	{
 		if ($row['topic_status'] == ITEM_MOVED)
 		{
@@ -439,8 +440,15 @@ if ($num_rows < $sql_limit)
 	$sql = $db->sql_build_query('SELECT', $sql_array);
 	$sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_STICKY : POST_NORMAL, $sql);
 
-	// 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));
+	if (!$store_reverse)
+	{
+		// 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));
+	}
+	else
+	{
+		$result = $db->sql_query_limit($sql, $sql_limit - $num_rows, $sql_start);
+	}
 
 	while ($row = $db->sql_fetchrow($result))
 	{