diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-12-17 10:07:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-12-17 10:07:52 +0100 |
| commit | 4bd503591469f47e710f1afbf0b5883f7770065d (patch) | |
| tree | 3f125f30b08b2d1a09063469543c974364deb331 /app/layout | |
| parent | 6952a13958417e8441645d0777597db679d0e28d (diff) | |
Rework encoding of search filters (#8324)
Rework:
* https://github.com/FreshRSS/FreshRSS/pull/8222
now that we have:
* https://github.com/FreshRSS/FreshRSS/pull/8293
Follow-up of:
* https://github.com/FreshRSS/FreshRSS/pull/8311
* More simplification
* Deprecate getRawInput
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/nav_menu.phtml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 04565c9b9..3c3a34243 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -39,7 +39,7 @@ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <div id="dropdown-search" class="dropdown-target"></div> - <a id="toggle-search" class="dropdown-toggle btn<?= (strlen(FreshRSS_Context::$search->getRawInput()) > 0) ? ' active' : ''; ?>" title="<?= _t('gen.menu.search') ?>" + <a id="toggle-search" class="dropdown-toggle btn<?= FreshRSS_Context::$search->__toString() !== '' ? ' active' : ''; ?>" title="<?= _t('gen.menu.search') ?>" href="#dropdown-search"><?= _i('search') ?></a> <ul class="dropdown-menu"> <li class="item"> @@ -56,7 +56,7 @@ <?php } ?> <div class="stick search"> <input type="search" name="search" - value="<?= htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" + value="<?= htmlspecialchars(FreshRSS_Context::$search->__toString(), ENT_COMPAT, 'UTF-8') ?>" placeholder="<?= _t('gen.menu.search') ?>" title="<?= _t('gen.menu.search') ?>" /><button class="btn" type="submit" title="<?= _t('index.menu.search_short') ?>"><?= _i('search') ?></button> </div> <p class="help"><?= _i('help') ?> <a href="<?= _url('search', 'index') ?>"><?= _t('gen.menu.advanced_search') ?></a></p> @@ -121,7 +121,7 @@ 'get' => $get, 'nextGet' => FreshRSS_Context::$next_get, 'idMax' => FreshRSS_Context::$id_max, - 'search' => htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), + 'search' => FreshRSS_Context::$search->__toString(), 'state' => FreshRSS_Context::$state, 'sort' => FreshRSS_Context::$sort, 'order' => FreshRSS_Context::$order, |