diff options
| author | friendica <info@friendica.com> | 2013-11-29 14:08:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-29 14:09:21 -0800 |
| commit | 1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af (patch) | |
| tree | b1d8d2a83e8b0f18a5841f49af09603e9c636b6c /mod/photos.php | |
| parent | b707495b5072d6f15e801155b2ce54854224b33c (diff) | |
| download | volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.gz volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.bz2 volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.zip | |
quite a bit of work on default acl permissions and various acl quirks
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php index 43c74851a..64ca86941 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -699,8 +699,19 @@ function photos_content(&$a) { $usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 ); } + if($_is_owner) { + $channel = $a->get_channel(); + + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } + $albumselect_e = $albumselect; - $aclselect_e = (($_is_owner) ? populate_acl($a->get_channel(), false) : ''); + $aclselect_e = (($_is_owner) ? populate_acl($channel_acl) : ''); $tpl = get_markup_template('photos_upload.tpl'); $o .= replace_macros($tpl,array( |