diff options
| author | plegall <plg@piwigo.org> | 2013-04-11 14:28:04 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2013-04-11 14:28:04 +0000 |
| commit | 22d81a69f311dba69d5f87f11f9d7b2c5e44ff0d (patch) | |
| tree | 541ab46427937f0283b5350ed2a1fb29351cd32f /comments.php | |
| parent | 0490009705dcef00c7b775e0287a707e0defc15f (diff) | |
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
Diffstat (limited to 'comments.php')
| -rw-r--r-- | comments.php | 3 |
1 files changed, 1 insertions, 2 deletions
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 |