diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
| commit | 388872949ed0de4cf036e546fafb3f4b4bd04fee (patch) | |
| tree | 2fcefc5c8f2398166b8e7003033fe160cb3325fc /mod/search.php | |
| parent | b47ff712deafdb8617599b0af4403b9563c9be93 (diff) | |
| parent | 301c7cdb89b13c4fc7c502795f121e13c1f9441d (diff) | |
| download | volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.gz volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.bz2 volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/search.php')
| -rw-r--r-- | mod/search.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/search.php b/mod/search.php index 2c2e8c86a..663d355e2 100644 --- a/mod/search.php +++ b/mod/search.php @@ -143,7 +143,7 @@ function search_content(&$a,$update = 0, $load = false) { WHERE item_restrict = 0 AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 ) - and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " )) + and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) $pub_sql ) OR owner_xchan = '%s') $sql_extra group by mid ORDER BY created DESC $pager_sql", |