Merge pull request #9808 from annando/notice
Fix notice "Undefined index: internal-verb"
This commit is contained in:
commit
7762f8cbc6
2 changed files with 2 additions and 2 deletions
|
@ -2875,7 +2875,7 @@ function api_format_items_activities($item, $type = "json")
|
||||||
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY];
|
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY];
|
||||||
$ret = Post::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
|
$ret = Post::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
|
||||||
|
|
||||||
while ($parent_item = Item::fetch($ret)) {
|
while ($parent_item = Post::fetch($ret)) {
|
||||||
// not used as result should be structured like other user data
|
// not used as result should be structured like other user data
|
||||||
//builtin_activity_puller($i, $activities);
|
//builtin_activity_puller($i, $activities);
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ class PublicTimeline extends BaseApi
|
||||||
$items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
|
$items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
|
||||||
|
|
||||||
$statuses = [];
|
$statuses = [];
|
||||||
while ($item = Item::fetch($items)) {
|
while ($item = Post::fetch($items)) {
|
||||||
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $item['uid']);
|
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $item['uid']);
|
||||||
}
|
}
|
||||||
DBA::close($items);
|
DBA::close($items);
|
||||||
|
|
Loading…
Reference in a new issue