harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/api.php
This commit is contained in:
redmatrix 2015-10-13 16:19:25 -07:00
commit edeba4ca34
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/api.php
View File

@ -622,7 +622,7 @@ require_once('include/attach.php');
function api_attach_list(&$a,$type) { function api_attach_list(&$a,$type) {
logger('api_user: ' . api_user()); 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); api_register_func('api/red/files','api_attach_list', true);
@ -635,8 +635,9 @@ require_once('include/attach.php');
dbesc($_REQUEST['file_id']) dbesc($_REQUEST['file_id'])
); );
if($r) { if($r) {
$data = dbunescbin($r[0]['data']); if($r[0]['is_dir'])
if(intval($r[0]['os_storage'])) $r[0]['data'] = '';
elseif(intval($r[0]['os_storage']))
$r[0]['data'] = base64_encode(file_get_contents(dbunescbin($r[0]['data']))); $r[0]['data'] = base64_encode(file_get_contents(dbunescbin($r[0]['data'])));
else else
$r[0]['data'] = base64_encode(dbunescbin($r[0]['data'])); $r[0]['data'] = base64_encode(dbunescbin($r[0]['data']));

2
version.inc
View File

@ -1 +1 @@
2015-10-12.1183 2015-10-13.1184