aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-01-11 21:03:48 +0000
committerrvelices <rv-github@modusoptimus.com>2011-01-11 21:03:48 +0000
commit43780ae7a758ec3260750c51d531859ba9dc4357 (patch)
tree59114d7eafc6d88fa722eb5b9ea3c227ddfb7bf3
parent96e3eb2d0cc7b9c2e48311a93900f3d094479f67 (diff)
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
-rw-r--r--include/functions_search.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php
index 06fa6f423..a8b005517 100644
--- a/include/functions_search.inc.php
+++ b/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;