Merge pull request #11265 from k-alin/6606-k-alin-mysql-unix-socket

[friendica.git] / src / Content / Widget / SavedSearches.php

diff --git a/src/Content/Widget/SavedSearches.php b/src/Content/Widget/SavedSearches.php
index 355f41f73045bf097915a6f6705de078a515df84..bf0e798661a44698a4c88c53e3f95556bf265c1c 100644 (file)
--- a/src/Content/Widget/SavedSearches.php
+++ b/src/Content/Widget/SavedSearches.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Content\Widget;
 
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 
@@ -35,32 +36,32 @@ class SavedSearches
         */
        public static function getHTML($return_url, $search = '')
        {
-               $o = '';
-
+               $saved = [];
                $saved_searches = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
-               if (DBA::isResult($saved_searches)) {
-                       $saved = [];
-                       foreach ($saved_searches as $saved_search) {
-                               $saved[] = [
-                                       'id'          => $saved_search['id'],
-                                       'term'        => $saved_search['term'],
-                                       'encodedterm' => urlencode($saved_search['term']),
-                                       'delete'      => DI::l10n()->t('Remove term'),
-                                       'selected'    => $search == $saved_search['term'],
-                               ];
-                       }
-
-                       $tpl = Renderer::getMarkupTemplate('widget/saved_searches.tpl');
+               while ($saved_search = DBA::fetch($saved_searches)) {
+                       $saved[] = [
+                               'id'          => $saved_search['id'],
+                               'term'        => $saved_search['term'],
+                               'encodedterm' => urlencode($saved_search['term']),
+                               'searchpath'  => Search::getSearchPath($saved_search['term']),
+                               'delete'      => DI::l10n()->t('Remove term'),
+                               'selected'    => $search == $saved_search['term'],
+                       ];
+               }
+               DBA::close($saved_searches);
 
-                       $o = Renderer::replaceMacros($tpl, [
-                               '$title'      => DI::l10n()->t('Saved Searches'),
-                               '$add'        => '',
-                               '$searchbox'  => '',
-                               '$saved'      => $saved,
-                               '$return_url' => urlencode($return_url),
-                       ]);
+               if (empty($saved)) {
+                       return '';
                }
 
-               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),
+               ]);
        }
 }