diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-08-01 00:57:15 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-08-01 00:57:15 +0200 |
commit | b66cd8363e19a05853876dd3146dd64bb7e683d2 (patch) | |
tree | a5d758fed1d7c8b9b8a7254563250578155811d7 /Zotlabs | |
parent | 376b05bcc9bbe6848c5693cd53201c0e8c8415ee (diff) | |
parent | 9ec995dbf072eb3143cae2b11a89522577a005ff (diff) | |
download | volse-hubzilla-b66cd8363e19a05853876dd3146dd64bb7e683d2.tar.gz volse-hubzilla-b66cd8363e19a05853876dd3146dd64bb7e683d2.tar.bz2 volse-hubzilla-b66cd8363e19a05853876dd3146dd64bb7e683d2.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Filestorage.php | 10 | ||||
-rw-r--r-- | Zotlabs/Module/Sharedwithme.php | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 0b83dea34..55713027a 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -5,14 +5,6 @@ namespace Zotlabs\Module; * */ -require_once('include/attach.php'); - - -/** - * - * @param object &$a - */ - class Filestorage extends \Zotlabs\Web\Controller { function post() { @@ -36,7 +28,7 @@ class Filestorage extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); $acl = new \Zotlabs\Access\AccessList($channel); - $acl->set_from_array($_REQUEST); + $acl->set_from_array($_POST); $x = $acl->get(); $url = get_cloud_url($channel_id, $channel['channel_address'], $resource); diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php index 5d6d0f7da..2c97e9726 100644 --- a/Zotlabs/Module/Sharedwithme.php +++ b/Zotlabs/Module/Sharedwithme.php @@ -4,6 +4,11 @@ require_once('include/conversation.php'); require_once('include/text.php'); +/** + * @file Zotlabs/Module/Sharedwithme.php + * + */ + class Sharedwithme extends \Zotlabs\Web\Controller { function get() { |