iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #739, make sure keys are reset in the "uniquified" array

Browse Source 
... for a regular search, when different set of photos matches the search.
This commit is contained in:
plegall
2017-07-25 18:25:36 +02:00
parent a3cf80c77c
commit 028c4ee2d5
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/functions_search.inc.php
View File

@@ -269,10 +269,17 @@ SELECT DISTINCT(id)
if (isset($search_in_tags_items))
{
$items = array_unique(
array_merge(
$items,
$search_in_tags_items
// TODO the sorting order will not match $conf['order_by'], a solution would be
// to have a new SQL query 'where id in (merged ids) order by $conf[order_by]'
//
// array_values will reset the numeric keys, without changing the sorting order.
// picture.php relies on these keys to be sequential {0,1,2} and not {0,1,5}
$items = array_values(
array_unique(
array_merge(
$items,
$search_in_tags_items
)
)
);
}
@@ -292,10 +299,12 @@ SELECT DISTINCT(id)
}
break;
case 'OR':
$items = array_unique(
array_merge(
$items,
$tag_items
$items = array_values(
array_unique(
array_merge(
$items,
$tag_items
)
)
);
break;