diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-06-04 14:00:08 +0000 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-06-04 14:00:08 +0000 |
| commit | d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2 (patch) | |
| tree | cd0a06052eb398d0401ca61314d9db8a6ce91599 /mod/display.php | |
| parent | 5869836180d8721363294c5d8dbe64d6b54571c6 (diff) | |
| parent | d84f03d59b4b3f625b36852211698f5606b6b37c (diff) | |
| download | volse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.tar.gz volse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.tar.bz2 volse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php index efc3265c8..8eb271b9c 100644 --- a/mod/display.php +++ b/mod/display.php @@ -150,6 +150,9 @@ function display_content(&$a, $update = 0, $load = false) { if($load || ($_COOKIE['jsAvailable'] != 1)) { $r = null; + require_once('include/identity.php'); + $sys = get_sys_channel(); + if(local_user()) { $r = q("SELECT * from item WHERE item_restrict = 0 @@ -169,12 +172,14 @@ function display_content(&$a, $update = 0, $load = false) { $r = q("SELECT * from item WHERE item_restrict = 0 and mid = '%s' - AND ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' + 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) . " )) + OR owner_xchan = '%s') $sql_extra ) group by mid limit 1", - dbesc($target_item['parent_mid']) + dbesc($target_item['parent_mid']), + dbesc($sys['xchan_hash']) ); } |