diff options
| -rw-r--r-- | mod/photos.php | 8 | ||||
| -rwxr-xr-x | mod/setup.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 10 insertions, 2 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'])); diff --git a/mod/setup.php b/mod/setup.php index 9bcbabbc5..6dc141702 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -365,7 +365,7 @@ function setup_content(&$a) { '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 0, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), + '$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 1, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), diff --git a/version.inc b/version.inc index aa115dccf..a656e3cbe 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-02-10.1305H +2016-02-11.1306H |