From 22d81a69f311dba69d5f87f11f9d7b2c5e44ff0d Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 11 Apr 2013 14:28:04 +0000
Subject: merge r22141 from branch 2.5 to trunk

bug 2887 fixed: avoid private photos to be returned as results on user comment
search with the appropriate author.



git-svn-id: http://piwigo.org/svn/trunk@22142 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 comments.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'comments.php')

diff --git a/comments.php b/comments.php
index 07b4581fe..c0ecc9263 100644
--- a/comments.php
+++ b/comments.php
@@ -148,8 +148,7 @@ if (isset($_GET['cat']) and 0 != $_GET['cat'])
 if (!empty($_GET['author']))
 {
   $page['where_clauses'][] =
-    'u.'.$conf['user_fields']['username'].' = \''.$_GET['author'].'\'
-     OR author = \''.$_GET['author'].'\'';
+    '(u.'.$conf['user_fields']['username'].' = \''.$_GET['author'].'\' OR author = \''.$_GET['author'].'\')';
 }
 
 // search a specific comment (if you're coming directly from an admin
-- 
cgit v1.2.3