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
This commit is contained in:
plegall 2013-04-11 14:28:04 +00:00
parent 0490009705
commit 22d81a69f3

View file

@ -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