diff options
| author | Thomas <rat@rlyeh-military-affairs> | 2012-03-06 23:56:37 +0000 |
|---|---|---|
| committer | Thomas <rat@rlyeh-military-affairs> | 2012-03-06 23:56:37 +0000 |
| commit | dadf80f64479792be85c7026fe1e3c5440066211 (patch) | |
| tree | 9bb9f515c571d361b9e16f6ef6a308f4ffac5ed2 /mod/display.php | |
| parent | 22624917e03b0ea90de19b0808c5435aa04d3613 (diff) | |
| parent | 05a52b2660a879a97d511b180e26fe12310d0464 (diff) | |
| download | volse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.tar.gz volse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.tar.bz2 volse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
images/smiley-beard.png
Diffstat (limited to 'mod/display.php')
| -rwxr-xr-x | mod/display.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php index f510f793d..4f2e5ff9a 100755 --- a/mod/display.php +++ b/mod/display.php @@ -34,7 +34,7 @@ function display_content(&$a) { $contact = null; $remote_contact = false; - +dbg(1); if(remote_user()) { $contact_id = $_SESSION['visitor_id']; $groups = init_groups_visitor($contact_id); @@ -87,6 +87,9 @@ function display_content(&$a) { $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); + if(! local_user() && ! remote_user()) + $sql_extra .= " and `item`.`private` = 0 "; + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, @@ -135,7 +138,7 @@ function display_content(&$a) { } } - +dbg(0); return $o; } |