diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-22 20:31:31 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-22 20:31:31 -0700 |
| commit | 0b16a5531a757c74da5a12ba4678011ed6c6d221 (patch) | |
| tree | 155f65228377a0f371f233bd1918d25f1b5a1d62 /Zotlabs/Module/Photos.php | |
| parent | b7fbd0ee50428402c1d692e74d978cac236f6ae2 (diff) | |
| download | volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.gz volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.bz2 volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.zip | |
Revert "Merge branch '1.12RC'"
This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing
changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.
Diffstat (limited to 'Zotlabs/Module/Photos.php')
| -rw-r--r-- | Zotlabs/Module/Photos.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 6aeac7af7..1eeab1461 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -668,10 +668,6 @@ class Photos extends \Zotlabs\Web\Controller { '$selname' => $selname, '$permissions' => t('Permissions'), '$aclselect' => $aclselect, - '$allow_cid' => acl2json($channel_acl['allow_cid']), - '$allow_gid' => acl2json($channel_acl['allow_gid']), - '$deny_cid' => acl2json($channel_acl['deny_cid']), - '$deny_gid' => acl2json($channel_acl['deny_gid']), '$lockstate' => $lockstate, '$uploader' => $ret['addon_text'], '$default' => (($ret['default_upload']) ? true : false), @@ -1020,7 +1016,7 @@ class Photos extends \Zotlabs\Web\Controller { // FIXME - remove this when we move to conversation module $r = $r[0]['children']; - + $edit = null; if($can_post) { $album_e = $ph[0]['album']; @@ -1046,10 +1042,6 @@ class Photos extends \Zotlabs\Web\Controller { 'tag_label' => t('Add a Tag'), 'permissions' => t('Permissions'), 'aclselect' => $aclselect_e, - 'allow_cid' => acl2json($ph[0]['allow_cid']), - 'allow_gid' => acl2json($ph[0]['allow_gid']), - 'deny_cid' => acl2json($ph[0]['deny_cid']), - 'deny_gid' => acl2json($ph[0]['deny_gid']), 'lockstate' => $lockstate[0], 'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'), 'item_id' => ((count($linked_items)) ? $link_item['id'] : 0), |