mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
[ticket/10532] Remove one unnecessary level of if block nesting.
PHPBB3-10532
This commit is contained in:
@@ -474,8 +474,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||
$found_more_search_matches = false;
|
||||
|
||||
if ($search_id)
|
||||
{
|
||||
if ($sql || $search_id == 'unreadposts')
|
||||
{
|
||||
if ($sql)
|
||||
{
|
||||
@@ -493,6 +491,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||
// 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)
|
||||
@@ -522,11 +524,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||
$start = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_id = '';
|
||||
}
|
||||
}
|
||||
|
||||
// make sure that some arrays are always in the same order
|
||||
sort($ex_fid_ary);
|
||||
|
Reference in New Issue
Block a user