diff options
| author | friendica <info@friendica.com> | 2014-06-19 16:09:02 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-19 16:09:02 -0700 |
| commit | 00904d49946c4a411225555cb99b5700f6ab51e4 (patch) | |
| tree | d263d203c2f4b96326d02705db22895ecdb9d562 /mod | |
| parent | 4c0b8bc637fe6773f8053b1672122c18a5788986 (diff) | |
| download | volse-hubzilla-00904d49946c4a411225555cb99b5700f6ab51e4.tar.gz volse-hubzilla-00904d49946c4a411225555cb99b5700f6ab51e4.tar.bz2 volse-hubzilla-00904d49946c4a411225555cb99b5700f6ab51e4.zip | |
cleanup
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php index 15b76e63d..31cce95d3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -175,7 +175,7 @@ function display_content(&$a, $update = 0, $load = false) { and mid = '%s' 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) . " )) OR owner_xchan = '%s') $sql_extra ) group by mid limit 1", 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", |