1 files changed, 20 insertions, 6 deletions
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index d6ac3b3acc..7ed4146f27 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -349,7 +349,8 @@ class dbal_mssqlnative extends dbal
 	{
 		$this->query_result = false;
 
-		if ($offset === false || $offset == 0)
+		// total == 0 means all results - not zero results
+		if ($offset == 0 && $total !== 0)
 		{
 			if (strpos($query, "SELECT") === false)
 			{
@@ -360,13 +361,21 @@ class dbal_mssqlnative extends dbal
 				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
 			}
 		}
-		else
+		else if ($offset > 0)
 		{
 			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
 			$query = 'SELECT *
 					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
-					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3
-					WHERE line3 BETWEEN ' . ($offset+1) . ' AND ' . ($offset + $total);
+					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
+
+			if ($total > 0)
+			{
+				$query .= ' WHERE line3 BETWEEN ' . ($offset+1) . ' AND ' . ($offset + $total);
+			}
+			else
+			{
+				$query .= ' WHERE line3 > ' . $offset;
+			}
 		}
 
 		$result = $this->sql_query($query, $cache_ttl);
@@ -406,13 +415,18 @@ class dbal_mssqlnative extends dbal
 
 		$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
 
-		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
 		if ($row)
 		{
 			foreach ($row as $key => $value)
 			{
 				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
 			}
+
+			// remove helper values from LIMIT queries
+			if (isset($row['line2']))
+			{
+				unset($row['line2'], $row['line3']);
+			}
 		}
 		return $row;
 	}
@@ -624,4 +638,4 @@ class dbal_mssqlnative extends dbal
 	}
 }
 
-?>
-\ No newline at end of file
+?>