From 028c4ee2d5a09d4e38459182dd432859a932678e Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 25 Jul 2017 18:25:36 +0200
Subject: [PATCH] fixes #739, make sure keys are reset in the "uniquified"
 array

... for a regular search, when different set of photos matches the search.
---
 include/functions_search.inc.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php
index c81660888..536e1f3fc 100644
--- a/include/functions_search.inc.php
+++ b/include/functions_search.inc.php
@@ -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;