blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
ma0048
2021-12-03 15:21:38 +01:00
parent 4923c5fc2d
commit 376aaadecc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/stammdaten/personen_wartung.php
+8 -8
View File
@@ -298,16 +298,16 @@ if (isset($personToDelete) && isset($personToKeep) && $personToDelete >= 0 && $p
if ($udfToKeep != $udfToDelete)
{
foreach ($udfToDelete as $key => $udf)
foreach ($udfToDelete as $key => $udfValue)
{
if (!array_key_exists($key, $udfToKeep))
{
$udfToKeep[$key] = $udf;
$udfToKeep[$key] = $udfValue;
}
elseif ($udfToKeep[$key] !== $udf && !is_null($udf))
elseif ($udfToKeep[$key] !== $udfValue && !is_null($udfValue))
{
if (is_null($udfToKeep[$key]))
$udfToKeep[$key] = $udf;
$udfToKeep[$key] = $udfValue;
else
{
$msg_error[] = 'Beide Personen haben unterschiedliche Werte in den UDFs und können nicht zusammengelegt werden.<br>
@@ -850,16 +850,16 @@ if (isset($personToDelete) && isset($personToKeep) && $personToDelete >= 0 && $p
if ($udfToKeep != $udfToDelete)
{
foreach ($udfToDelete as $udfKey => $udf)
foreach ($udfToDelete as $udfKey => $udfValue)
{
if (!array_key_exists($udfKey, $udfToKeep))
{
$udfToKeep[$udfKey] = $udf;
$udfToKeep[$udfKey] = $udfValue;
}
elseif ($udfToKeep[$udfKey] !== $udf && !is_null($udf))
elseif ($udfToKeep[$udfKey] !== $udfValue && !is_null($udfValue))
{
if (is_null($udfToKeep[$udfKey]))
$udfToKeep[$udfKey] = $udf;
$udfToKeep[$udfKey] = $udfValue;
else
{