From d68372c872cd8240f8c4c91c63232d537c9984b0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 6 Jun 2020 18:45:16 +0000
Subject: [PATCH] Issue 8732: Fix fetch aved searches

---
 src/Content/Widget/SavedSearches.php | 47 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/Content/Widget/SavedSearches.php b/src/Content/Widget/SavedSearches.php
index 6bc363a81a..30e5b9c2ab 100644
--- a/src/Content/Widget/SavedSearches.php
+++ b/src/Content/Widget/SavedSearches.php
@@ -36,33 +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']),
-					'searchpath'  => Search::getSearchPath($saved_search['term']),
-					'delete'      => DI::l10n()->t('Remove term'),
-					'selected'    => $search == $saved_search['term'],
-				];
-			}
+		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);
 
-			$tpl = Renderer::getMarkupTemplate('widget/saved_searches.tpl');
-
-			$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),
+		]);
 	}
 }