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
Piwigo · Apr 11, 2013 · 22d81a6 · 22d81a6
1 parent 0490009
commit 22d81a6
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/comments.php b/comments.php
@@ -148,8 +148,7 @@
 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