lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
This commit is contained in:
Laurent Destailleur 2021-06-14 14:21:53 +02:00
commit d0b033548c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/bookmarks/bookmarks.lib.php
View File

@ -45,15 +45,15 @@ function printDropdownBookmarksList()
$tmpurl = ''; $tmpurl = '';
// No urlencode, all param $url will be urlencoded later // No urlencode, all param $url will be urlencoded later
if ($sortfield) { if ($sortfield) {
$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield; $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.urlencode($sortfield);
} }
if ($sortorder) { if ($sortorder) {
$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder; $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.urlencode($sortorder);
} }
if (is_array($_POST)) { if (is_array($_POST)) {
foreach ($_POST as $key => $val) { foreach ($_POST as $key => $val) {
if (preg_match('/^search_/', $key) && $val != '') { if (preg_match('/^search_/', $key) && $val != '') {
$tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val; $tmpurl .= ($tmpurl ? '&' : '').http_build_query(array($key => $val));
} }
} }
} }