diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 21:33:56 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 21:33:56 -0500 |
| commit | edfa7dbac2ff8ed054fce90cba40efcca6c85529 (patch) | |
| tree | 2c5e17fcd19506101dcfe9ba4ab044b426091da8 /mod | |
| parent | d89cd6569bac3d157870b478b41f72c8958ea382 (diff) | |
| parent | 7ad2dd65654f6b1cb17ae98e65c3e95528d29e30 (diff) | |
| download | volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.tar.gz volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.tar.bz2 volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix photos after permissions_sql change
[privacy] rework latest fix
remove stray debugging
* master:
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/display.php | 9 | ||||
| -rwxr-xr-x | mod/profile.php | 2 |
2 files changed, 4 insertions, 7 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; } diff --git a/mod/profile.php b/mod/profile.php index 74e1a2302..1a701f407 100755 --- a/mod/profile.php +++ b/mod/profile.php @@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) { * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups */ - $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); if($update) { |