aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-13 16:15:34 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-13 16:15:34 -0700
commit578f1b8ece49c6b8aa8eb34e33f37f456d5a4d90 (patch)
treea15539380cf545f6d15dca21d67f9e65d9ee05bf /include
parent73dad85867b1d55a7da7fea99c90c6364b85b399 (diff)
downloadvolse-hubzilla-578f1b8ece49c6b8aa8eb34e33f37f456d5a4d90.tar.gz
volse-hubzilla-578f1b8ece49c6b8aa8eb34e33f37f456d5a4d90.tar.bz2
volse-hubzilla-578f1b8ece49c6b8aa8eb34e33f37f456d5a4d90.zip
api extenesions for file migration
Diffstat (limited to 'include')
-rw-r--r--include/api.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/api.php b/include/api.php
index 863c7a463..258d197a5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -622,7 +622,7 @@ require_once('include/attach.php');
function api_attach_list(&$a,$type) {
logger('api_user: ' . api_user());
- json_return_and_die(attach_list_files(api_user(),get_observer_hash()));
+ json_return_and_die(attach_list_files(api_user(),get_observer_hash(),'','','','created asc'));
}
api_register_func('api/red/files','api_attach_list', true);
@@ -635,10 +635,11 @@ require_once('include/attach.php');
dbesc($_REQUEST['file_id'])
);
if($r) {
- $data = dbunescbin($r[0]['data']);
- if($r[0]['flags'] & ATTACH_FLAG_DIR)
+ if($r[0]['flags'] & ATTACH_FLAG_DIR) {
$r[0]['is_dir'] = '1';
- if($r[0]['flags'] & ATTACH_FLAG_OS)
+ $r[0]['data'] = '';
+ }
+ elseif($r[0]['flags'] & ATTACH_FLAG_OS)
$r[0]['data'] = base64_encode(file_get_contents(dbunescbin($r[0]['data'])));
else
$r[0]['data'] = base64_encode(dbunescbin($r[0]['data']));