diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-12 06:28:40 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-12 06:28:40 +0100 |
| commit | ac4a8fde3a662f4f8918177ae4e5decefdc2ad11 (patch) | |
| tree | d8929c45e08c903ae92366756ce408d01a676e29 /mod/photos.php | |
| parent | 95c686de6edd5d5e6b85a5f283770441fb7852ea (diff) | |
| parent | 31aaf40ade183c91e8691ef7361237f87d713fd2 (diff) | |
| download | volse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.tar.gz volse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.tar.bz2 volse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mod/photos.php b/mod/photos.php index d6105c580..944686637 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -603,6 +603,14 @@ function photos_content(&$a) { $aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : ''); + // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables + // don't exist. They really should be set to a parseable representation of the channel's default permissions + // which can be processed by getSelected() + + if(! $aclselect) { + $aclselect = '<input id="group_allow" type="hidden" name="allow_gid[]" value="" /><input id="contact_allow" type="hidden" name="allow_cid[]" value="" /><input id="group_deny" type="hidden" name="deny_gid[]" value="" /><input id="contact_deny" type="hidden" name="deny_cid[]" value="" />'; + } + $selname = (($datum) ? hex2bin($datum) : ''); $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); |