extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-28 00:40:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some numeric customfields causing conversion/formatting problems

Browse Source
This commit is contained in:
nathan 2024-12-05 11:30:08 -07:00
parent 230635c5d6
commit 826c2149c5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Storage/Merge.php
View File

@ -1426,6 +1426,10 @@ abstract class Merge
{ {
foreach($this->numeric_fields as $fieldname) foreach($this->numeric_fields as $fieldname)
{ {
if(!array_key_exists($fieldname, $replacements))
{
continue;
}
$names[] = preg_quote($fieldname, '/'); $names[] = preg_quote($fieldname, '/');
$raw_placeholder = $this->prefix("", $fieldname . '_-raw-', '$'); $raw_placeholder = $this->prefix("", $fieldname . '_-raw-', '$');
if(!array_key_exists($raw_placeholder, $replacements)) if(!array_key_exists($raw_placeholder, $replacements))
@ -3052,7 +3056,7 @@ abstract class Merge
*/ */
static public function number_format($number, $num_decimal_places = 2, $_mimetype = '') static public function number_format($number, $num_decimal_places = 2, $_mimetype = '')
{ {
if((string)$number === '') if(is_null($number) || (string)$number === '')
{ {
return ''; return '';
} }