X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FWidget%2FSavedSearches.php;h=bf0e798661a44698a4c88c53e3f95556bf265c1c;hb=419fe67c6ca23dff0b2ec59d2af0c5e29699a648;hp=7f7c171e09af7768d2b266ff9b90ce94a351526c;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git

diff --git a/src/Content/Widget/SavedSearches.php b/src/Content/Widget/SavedSearches.php
index 7f7c171e09..bf0e798661 100644
--- a/src/Content/Widget/SavedSearches.php
+++ b/src/Content/Widget/SavedSearches.php
@@ -1,10 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Content\Widget;
 
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 class SavedSearches
 {
@@ -16,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'      => 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'      => 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),
+		]);
 	}
 }