aboutsummaryrefslogtreecommitdiffstats
path: root/mod/filestorage.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
commit0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch)
treea92197de4503ec52889dc05483493f4df1a305b8 /mod/filestorage.php
parent99d9456b3addc651a68874ddd391d25684252c4d (diff)
parentb4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff)
downloadvolse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/filestorage.php')
-rw-r--r--mod/filestorage.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php
index 753300e89..1feffa9ee 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -28,7 +28,7 @@ function filestorage_post(&$a) {
return;
}
- $channel = $a->get_channel();
+ $channel = App::get_channel();
$acl = new Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_REQUEST);
@@ -52,7 +52,7 @@ function filestorage_content(&$a) {
$which = argv(1);
else {
notice( t('Requested profile is not available.') . EOL );
- $a->error = 404;
+ App::$error = 404;
return;
}
@@ -64,7 +64,7 @@ function filestorage_content(&$a) {
$owner = intval($r[0]['channel_id']);
}
- $observer = $a->get_observer();
+ $observer = App::get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms($owner, $ob_hash);
@@ -100,7 +100,7 @@ function filestorage_content(&$a) {
}
$f = $r[0];
- $channel = $a->get_channel();
+ $channel = App::get_channel();
$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
@@ -123,7 +123,7 @@ function filestorage_content(&$a) {
);
$f = $r[0];
- $channel = $a->get_channel();
+ $channel = App::get_channel();
$cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : '');
$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);