diff options
| author | Thomas <rat@rlyeh-military-affairs> | 2012-03-09 01:50:51 +0000 |
|---|---|---|
| committer | Thomas <rat@rlyeh-military-affairs> | 2012-03-09 01:50:51 +0000 |
| commit | eb84a22da749264fa79829d27471002d9f1e287f (patch) | |
| tree | 3f06ec010f13484dd50eceb7ca7f58e96b4e8847 /mod/display.php | |
| parent | 6ae5962b009cfd88925eae721e24bf895e8b78d5 (diff) | |
| parent | b86a08166cf0db891392b2877c290231a3143238 (diff) | |
| download | volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.gz volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.bz2 volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/display.php')
| -rwxr-xr-x | mod/display.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mod/display.php b/mod/display.php index 4f2e5ff9a..f428149e8 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); @@ -85,10 +85,7 @@ dbg(1); $o .= status_editor($a,$x,0,true); - $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); - - if(! local_user() && ! remote_user()) - $sql_extra .= " and `item`.`private` = 0 "; + $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -138,7 +135,7 @@ dbg(1); } } -dbg(0); + return $o; } |