Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Removed warning

Browse Source
This commit is contained in:
Laurent Destailleur
2020-09-20 21:27:11 +02:00
parent 906e030bfb
commit 43376b3abc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -4107,7 +4107,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if (empty($thead) && $field && empty($disablesortlink)) // If this is a sort field
{
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
$options = preg_replace('/&+/i', '&', $options);
if (!preg_match('/^&/', $options)) $options = '&'.$options;
@@ -4147,7 +4147,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if (empty($thead) && $field) // If this is a sort field
{
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
$options = preg_replace('/&+/i', '&', $options);
if (!preg_match('/^&/', $options)) $options = '&'.$options;