tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8739 from annando/issue-8732

Browse source 
Issue 8732: Fix fetch saved searches
This commit is contained in:
Hypolite Petovan 2020-06-06 15:21:38 -04:00 committed by GitHub
parent b3c07fc726 d68372c872
commit b1e6a4e499
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/Content/Widget/SavedSearches.php
View file

@ -36,33 +36,32 @@ class SavedSearches
*/ */
public static function getHTML($return_url, $search = '') public static function getHTML($return_url, $search = '')
{ {
$o = ''; $saved = [];
$saved_searches = DBA::select('search', ['id', 'term'], ['uid' => local_user()]); $saved_searches = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
if (DBA::isResult($saved_searches)) { while ($saved_search = DBA::fetch($saved_searches)) {
$saved = []; $saved[] = [
foreach ($saved_searches as $saved_search) { 'id' => $saved_search['id'],
$saved[] = [ 'term' => $saved_search['term'],
'id' => $saved_search['id'], 'encodedterm' => urlencode($saved_search['term']),
'term' => $saved_search['term'], 'searchpath' => Search::getSearchPath($saved_search['term']),
'encodedterm' => urlencode($saved_search['term']), 'delete' => DI::l10n()->t('Remove term'),
'searchpath' => Search::getSearchPath($saved_search['term']), 'selected' => $search == $saved_search['term'],
'delete' => DI::l10n()->t('Remove term'), ];
'selected' => $search == $saved_search['term'], }
]; DBA::close($saved_searches);
}
$tpl = Renderer::getMarkupTemplate('widget/saved_searches.tpl'); if (empty($saved)) {
return '';
$o = Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Saved Searches'),
'$add' => '',
'$searchbox' => '',
'$saved' => $saved,
'$return_url' => urlencode($return_url),
]);
} }
return $o; $tpl = Renderer::getMarkupTemplate('widget/saved_searches.tpl');
return Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Saved Searches'),
'$add' => '',
'$searchbox' => '',
'$saved' => $saved,
'$return_url' => urlencode($return_url),
]);
} }
} }