bug 2101: merge from trunk to 2.1 php warning/errors + broken navigation when using the advanced search form

git-svn-id: http://piwigo.org/svn/branches/2.1@8612 68402e56-0260-453c-a942-63ccdbb3a9ee

include/functions_search.inc.php

@@ -223,7 +223,7 @@ function get_regular_search_results($search, $images_where)
   if (!empty($search_clause))
   {
     $query = '
-SELECT id
+SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.' i
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE '.$search_clause;