Changeset 22142


Ignore:
Timestamp:
04/11/13 16:28:04 (7 years ago)
Author:
plg
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/comments.php

    r20609 r22142  
    149149{ 
    150150  $page['where_clauses'][] = 
    151     'u.'.$conf['user_fields']['username'].' = \''.$_GET['author'].'\' 
    152      OR author = \''.$_GET['author'].'\''; 
     151    '(u.'.$conf['user_fields']['username'].' = \''.$_GET['author'].'\' OR author = \''.$_GET['author'].'\')'; 
    153152} 
    154153 
Note: See TracChangeset for help on using the changeset viewer.