From 6548a3094f2981a19ff001e67596befab4159ecd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Feb 2012 02:19:12 +0100
Subject: [PATCH] [ticket/10532] Remove one unnecessary level of if block
 nesting.

PHPBB3-10532
---
 phpBB/search.php | 81 +++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 3006c0e5d9..d89bc79225 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -475,57 +475,54 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 	if ($search_id)
 	{
-		if ($sql || $search_id == 'unreadposts')
+		if ($sql)
 		{
-			if ($sql)
-			{
-				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-				$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
+			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+			$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
 
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$id_ary[] = (int) $row[$field];
-				}
-				$db->sql_freeresult($result);
-			}
-			else if ($search_id == 'unreadposts')
+			while ($row = $db->sql_fetchrow($result))
 			{
-				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
-			}
-
-			$total_match_count = sizeof($id_ary);
-			if ($total_match_count)
-			{
-				// Limit the number to $total_matches_limit for pre-made searches
-				if ($total_match_count > $total_matches_limit)
-				{
-					$found_more_search_matches = true;
-					$total_match_count = $total_matches_limit;
-				}
-
-				// Make sure $start is set to the last page if it exceeds the amount
-				if ($start < 0)
-				{
-					$start = 0;
-				}
-				else if ($start >= $total_match_count)
-				{
-					$start = floor(($total_match_count - 1) / $per_page) * $per_page;
-				}
-
-				$id_ary = array_slice($id_ary, $start, $per_page);
-			}
-			else
-			{
-				// Set $start to 0 if no matches were found
-				$start = 0;
+				$id_ary[] = (int) $row[$field];
 			}
+			$db->sql_freeresult($result);
+		}
+		else if ($search_id == 'unreadposts')
+		{
+			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
 		}
 		else
 		{
 			$search_id = '';
 		}
+
+		$total_match_count = sizeof($id_ary);
+		if ($total_match_count)
+		{
+			// Limit the number to $total_matches_limit for pre-made searches
+			if ($total_match_count > $total_matches_limit)
+			{
+				$found_more_search_matches = true;
+				$total_match_count = $total_matches_limit;
+			}
+
+			// Make sure $start is set to the last page if it exceeds the amount
+			if ($start < 0)
+			{
+				$start = 0;
+			}
+			else if ($start >= $total_match_count)
+			{
+				$start = floor(($total_match_count - 1) / $per_page) * $per_page;
+			}
+
+			$id_ary = array_slice($id_ary, $start, $per_page);
+		}
+		else
+		{
+			// Set $start to 0 if no matches were found
+			$start = 0;
+		}
 	}
 
 	// make sure that some arrays are always in the same order