makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 8d0d6c012c into 59e8875fa8

Browse source
This commit is contained in:
rxu 2025-04-26 14:30:22 +07:00 • committed by GitHub
commit 97b30cc7b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/phpbb/search/base.php
View file

@ -76,10 +76,16 @@ class base
} }
} }
// If the sort direction differs from the direction in the cache, then reverse the ids array // If the sort direction differs from the direction in the cache, then recalculate array keys
if ($reverse_ids) if ($reverse_ids)
{ {
$stored_ids = array_reverse($stored_ids); $keys = array_keys($stored_ids);
array_walk($keys, function (&$value, $key) use ($result_count)
{
$value = ($value >= 0) ? $result_count - $value - 1 : $value;
}
);
$stored_ids = array_combine($keys, $stored_ids);
} }
for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++) for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++)
@ -130,6 +136,8 @@ class base
} }
$store_ids = array_slice($id_ary, 0, $length); $store_ids = array_slice($id_ary, 0, $length);
$id_range = range($start, $start + $length - 1);
$store_ids = array_combine($id_range, $store_ids);
// create a new resultset if there is none for this search_key yet // create a new resultset if there is none for this search_key yet
// or add the ids to the existing resultset // or add the ids to the existing resultset
@ -164,29 +172,26 @@ class base
$db->sql_query($sql); $db->sql_query($sql);
$store = array(-1 => $result_count, -2 => $sort_dir); $store = array(-1 => $result_count, -2 => $sort_dir);
$id_range = range($start, $start + $length - 1);
} }
else else
{ {
// we use one set of results for both sort directions so we have to calculate the indizes // we use one set of results for both sort directions so we have to calculate the indizes
// for the reversed array and we also have to reverse the ids themselves // for the reversed array
if ($store[-2] != $sort_dir) if ($store[-2] != $sort_dir)
{ {
$store_ids = array_reverse($store_ids); $keys = array_keys($store_ids);
$id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1); array_walk($keys, function (&$value, $key) use ($store) {
} $value = $store[-1] - $value - 1;
else });
{ $store_ids = array_combine($keys, $store_ids);
$id_range = range($start, $start + $length - 1);
} }
} }
$store_ids = array_combine($id_range, $store_ids);
// append the ids // append the ids
if (is_array($store_ids)) if (is_array($store_ids))
{ {
$store += $store_ids; $store += $store_ids;
ksort($store);
// if the cache is too big // if the cache is too big
if (count($store) - 2 > 20 * $config['search_block_size']) if (count($store) - 2 > 20 * $config['search_block_size'])