mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-01-26 22:27:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix double encoding for mark as read a search (#1945)

Browse Source 
* Fix double encoding for mark as read a search

Fix https://github.com/FreshRSS/FreshRSS/issues/1944

* Fix more search encoding issues
This commit is contained in:
Alexandre Alapetite
2018-06-20 20:49:48 +02:00
committed by GitHub
parent 767ac77ee2
commit c4903bc8db
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/layout/header.phtml
View File

@@ -25,7 +25,8 @@ if (FreshRSS_Auth::accessNeedsAction()) {
<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
<form action="<?php echo _url('index', 'index'); ?>" method="get">
<div class="stick">
<input type="search" name="search" id="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
<input type="search" name="search" id="search" class="extend" value="<?php
echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if ($get != '') { ?>

5
app/layout/nav_menu.phtml
View File

@@ -75,7 +75,7 @@
'get' => $get,
'nextGet' => FreshRSS_Context::$next_get,
'idMax' => FreshRSS_Context::$id_max,
'search' => FreshRSS_Context::$search,
'search' => htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES),
'state' => FreshRSS_Context::$state,
)
);
@@ -162,7 +162,8 @@
<div class="item search">
<form action="<?php echo _url('index', 'index'); ?>" method="get">
<input type="search" name="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
<input type="search" name="search" class="extend" value="<?php
echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if($get != '') { ?>

2
app/views/helpers/pagination.phtml
View File

@@ -11,7 +11,7 @@
'get' => FreshRSS_Context::currentGet(),
'nextGet' => FreshRSS_Context::$next_get,
'idMax' => FreshRSS_Context::$id_max,
'search' => FreshRSS_Context::$search,
'search' => htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES),
'state' => FreshRSS_Context::$state,
)
);