Merge remote-tracking branch 'upstream/edge' into edge

math-GH · Apr 24, 2024 · 1137dce · 1137dce
2 parents c571d88 + 5e66adc
commit 1137dce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
@@ -374,7 +374,6 @@ public function queryAction(): void {
 			if ('' === $name) {
 				$name = _t('conf.query.number', $id + 1);
 			}
-			$queryParams['name'] = $name;
 			if (!empty($params['get']) && is_string($params['get'])) {
 				$queryParams['get'] = htmlspecialchars_decode($params['get'], ENT_QUOTES);
 			}
@@ -399,6 +398,7 @@ public function queryAction(): void {
 				$queryParams['shareOpml'] = (bool)$params['shareOpml'];
 			}
 			$queryParams['url'] = Minz_Url::display(['params' => $queryParams]);
+			$queryParams['name'] = $name;
 
 			$queries = FreshRSS_Context::userConf()->queries;
 			$queries[$id] = (new FreshRSS_UserQuery($queryParams, FreshRSS_Context::categories(), FreshRSS_Context::labels()))->toArray();
@@ -442,6 +442,7 @@ public function bookmarkQueryAction(): void {
 			$queries[$key] = (new FreshRSS_UserQuery($query, FreshRSS_Context::categories(), FreshRSS_Context::labels()))->toArray();
 		}
 		$params = $_GET;
+		unset($params['name']);
 		unset($params['rid']);
 		$params['url'] = Minz_Url::display(['params' => $params]);
 		$params['name'] = _t('conf.query.number', count($queries) + 1);

diff --git a/app/Models/BooleanSearch.php b/app/Models/BooleanSearch.php
@@ -50,7 +50,6 @@ private function parseUserQueryNames(string $input, bool $allowUserQueries = tru
 		$all_matches = [];
 		if (preg_match_all('/\bsearch:(?P<delim>[\'"])(?P<search>.*)(?P=delim)/U', $input, $matchesFound)) {
 			$all_matches[] = $matchesFound;
-
 		}
 		if (preg_match_all('/\bsearch:(?P<search>[^\s"]*)/', $input, $matchesFound)) {
 			$all_matches[] = $matchesFound;