aboutsummaryrefslogtreecommitdiffstats
path: root/mod/display.php
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-06-22 18:00:23 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-06-22 18:00:23 +0100
commit388872949ed0de4cf036e546fafb3f4b4bd04fee (patch)
tree2fcefc5c8f2398166b8e7003033fe160cb3325fc /mod/display.php
parentb47ff712deafdb8617599b0af4403b9563c9be93 (diff)
parent301c7cdb89b13c4fc7c502795f121e13c1f9441d (diff)
downloadvolse-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/display.php')
-rw-r--r--mod/display.php2
1 files changed, 1 insertions, 1 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",