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/Filestorage.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/Filestorage.php')
| -rw-r--r-- | Zotlabs/Module/Filestorage.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index a401f4822..c3ef22e32 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -141,7 +141,7 @@ class Filestorage extends \Zotlabs\Web\Controller { // Encode path that is used for link so it's a valid URL // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath)); - + $o = replace_macros(get_markup_template('attach_edit.tpl'), array( '$header' => t('Edit file permissions'), '$file' => $f, @@ -151,10 +151,6 @@ class Filestorage extends \Zotlabs\Web\Controller { '$channelnick' => $channel['channel_address'], '$permissions' => t('Permissions'), '$aclselect' => $aclselect_e, - '$allow_cid' => acl2json($f['allow_cid']), - '$allow_gid' => acl2json($f['allow_gid']), - '$deny_cid' => acl2json($f['deny_cid']), - '$deny_gid' => acl2json($f['deny_gid']), '$lockstate' => $lockstate, '$permset' => t('Set/edit permissions'), '$recurse' => array('recurse', t('Include all files and sub folders'), 0, '', array(t('No'), t('Yes'))), @@ -165,7 +161,7 @@ class Filestorage extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$attach_btn_title' => t('Share this file'), '$link_btn_title' => t('Show URL to this file'), - '$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))), + '$notify' => array('notify', t('Notify your contacts about this file'), 0, '', array(t('No'), t('Yes'))) )); echo $o; |