diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2026-01-03 16:52:33 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2026-01-03 16:52:33 +0100 |
| commit | 252703305758e2ed0e6257ae94fdb3b4b90f7184 (patch) | |
| tree | 058b449bda17aef10eefbaadd38741161b47cb2b /app/Controllers | |
| parent | f0769d6e557320c6af93f7f589f9dbf05a96ca47 (diff) | |
Fix unwanted expansion of user queries in some cases (#8395)
fix https://github.com/FreshRSS/FreshRSS/issues/8378
Diffstat (limited to 'app/Controllers')
| -rw-r--r-- | app/Controllers/indexController.php | 6 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 0d704c496..ca88c9171 100644 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -94,8 +94,8 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { }; $searchString = $operator . ':' . ($offset < 0 ? '/' : '') . date('Y-m-d', $timestamp + ($offset * 86400)) . ($offset > 0 ? '/' : ''); return Minz_Url::display(Minz_Request::modifiedCurrentRequest([ - 'search' => FreshRSS_Context::$search->__toString() === '' ? $searchString : - FreshRSS_Context::$search->enforce(new FreshRSS_Search($searchString))->__toString(), + 'search' => FreshRSS_Context::$search->toString() === '' ? $searchString : + FreshRSS_Context::$search->enforce(new FreshRSS_Search($searchString))->toString(), ])); } @@ -135,7 +135,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { $this->view->rss_title = FreshRSS_Context::$name . ' | ' . FreshRSS_View::title(); $title = FreshRSS_Context::$name; - $search = FreshRSS_Context::$search->__toString(); + $search = FreshRSS_Context::$search->toString(expandUserQueries: false); if ($search !== '') { $title = '“' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8') . '”'; } diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 02942583f..eb9fbf58f 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -421,7 +421,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $actionsSearch = new FreshRSS_BooleanSearch('', operator: 'AND'); foreach ($filteractions as $action) { $actionSearch = new FreshRSS_BooleanSearch($action, operator: 'OR'); - if ($actionSearch->__toString() === '') { + if ($actionSearch->toString() === '') { continue; } $actionsSearch->add($actionSearch); @@ -433,7 +433,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { 'c' => 'index', 'a' => 'index', 'params' => [ - 'search' => $search->__toString(), + 'search' => $search->toString(), ], ], redirect: true); } |