keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9240 from annando/notice

Browse source 
Fix Notice: "Undefined variable: r"
This commit is contained in:
Tobias Diekershoff 2020-09-19 19:11:26 +02:00 committed by GitHub
commit 6e8f27b421
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Module/Search/Index.php
View file

@ -161,11 +161,10 @@ class Index extends BaseSearch
if (!empty($uriids)) { if (!empty($uriids)) {
$params = ['order' => ['id' => true], 'group_by' => ['uri-id']]; $params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
$items = Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params); $items = Item::inArray(Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params));
$r = Item::inArray($items);
} }
if (!DBA::isResult($r)) { if (empty($items)) {
notice(DI::l10n()->t('No results.')); notice(DI::l10n()->t('No results.'));
return $o; return $o;
} }
@ -182,7 +181,7 @@ class Index extends BaseSearch
Logger::info('Start Conversation.', ['q' => $search]); Logger::info('Start Conversation.', ['q' => $search]);
$o .= conversation(DI::app(), $r, 'search', false, false, 'commented', local_user()); $o .= conversation(DI::app(), $items, 'search', false, false, 'commented', local_user());
$o .= $pager->renderMinimal($count); $o .= $pager->renderMinimal($count);