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

issues uncovered testing combined item/file import

Browse Source
This commit is contained in:
zotlabs 2019-02-24 21:43:15 -08:00
parent 20e43311db
commit 1ff97754af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/api_zot.php
View File

@ -95,9 +95,9 @@
if(! $_REQUEST['since']) if(! $_REQUEST['since'])
$start = NULL_DATE; $start = NULL_DATE;
else { else {
$start = datetime_convert('UTC','UTC', $_REQUEST['since']); $start = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['since']);
} }
$finish = datetime_convert('UTC','UTC', (($_REQUEST['until']) ? $_REQUEST['until'] : 'now')); $finish = datetime_convert(date_default_timezone_get(),'UTC', (($_REQUEST['until']) ? $_REQUEST['until'] : 'now'));
json_return_and_die(channel_export_items_page(api_user(),$start,$finish,$page,$records)); json_return_and_die(channel_export_items_page(api_user(),$start,$finish,$page,$records));
} }

4
include/channel.php
View File

@ -1207,8 +1207,8 @@ function channel_export_items_page($channel_id, $start, $finish, $page = 0, $lim
$r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d", $r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d",
intval(ITEM_TYPE_POST), intval(ITEM_TYPE_POST),
intval($channel_id), intval($channel_id),
intval($start), dbesc($start),
intval($finish), dbesc($finish),
intval($limit), intval($limit),
intval($offset) intval($offset)
); );

2
include/text.php
View File

@ -3241,7 +3241,7 @@ function flatten_array_recursive($arr) {
$ret = array_merge($ret, $tmp); $ret = array_merge($ret, $tmp);
} }
} }
elseif($a) { elseif(isset($a)) {
$ret[] = $a; $ret[] = $a;
} }
} }