diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-03 21:53:01 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-03 21:53:01 +0200 |
| commit | 5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff (patch) | |
| tree | d3012cd1acd070372f3afb1403268c1506c8b584 /include/photos.php | |
| parent | 98fa996b3f5125b60e2653bca2218b08041ad6a4 (diff) | |
| parent | db70c76494997dfda4f850b4ee63ddae2c608bde (diff) | |
| download | volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.tar.gz volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.tar.bz2 volse-hubzilla-5adb41a0edd22c7ec9519ab0cdb5c06dda7140ff.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/photos.php b/include/photos.php index c5ea3971a..dced14705 100644 --- a/include/photos.php +++ b/include/photos.php @@ -55,6 +55,17 @@ function photo_upload($channel, $observer, $args) { $str_group_deny = perms2str(((is_array($args['group_deny'])) ? $args['group_deny'] : explode(',',$args['group_deny']))); $str_contact_deny = perms2str(((is_array($args['contact_deny'])) ? $args['contact_deny'] : explode(',',$args['contact_deny']))); + + if( (! array_key_exists('group_allow',$args)) + && (! array_key_exists('contact_allow',$args)) + && (! array_key_exists('group_deny',$args)) + && (! array_key_exists('contact_deny',$args))) { + $str_group_allow = $channel['channel_allow_gid']; + $str_contact_allow = $channel['channel_allow_cid']; + $str_group_deny = $channel['channel_deny_gid']; + $str_contact_deny = $channel['channel_deny_cid']; + } + $os_storage = 0; if($args['os_path'] && $args['getimagesize']) { |