holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that some things exist before trying to use them

Browse Source
This commit is contained in:
nathangray 2021-03-05 09:30:02 -07:00
parent 95f84454be
commit 8063d65303
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

@ -1213,7 +1213,7 @@ abstract class Merge
}
// Look for numbers, set their value if needed
if($this->numeric_fields || count($names))
if(property_exists($this,'numeric_fields') || count($names))
{
foreach((array)$this->numeric_fields as $fieldname) {
$names[] = preg_quote($fieldname,'/');
@ -1573,6 +1573,10 @@ abstract class Merge
try
{
$classname = "{$app}_merge";
if(!class_exists($classname))
{
return $replacements;
}
$class = new $classname();
$method = $app.'_replacements';
if(method_exists($class,$method))