aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-31 17:23:33 -0700
committerzotlabs <mike@macgirvin.com>2017-07-31 17:23:33 -0700
commit9476c631b0f9ba52be869b0c430fea81f4202352 (patch)
tree74bc7e214224bddf16ddc75f42ccb1a7e08da2ec /Zotlabs
parent445fa6825a20876441d07c28f7b7bbd2c8fd064c (diff)
parentb66cd8363e19a05853876dd3146dd64bb7e683d2 (diff)
downloadvolse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.tar.gz
volse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.tar.bz2
volse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Filestorage.php10
-rw-r--r--Zotlabs/Module/Sharedwithme.php5
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() {