Fixes the error that the description for an assigned trophy is `null`.

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractAcpForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractAcpForm.class.php
index 6bc8e3c711f65698b9491f3046fee7f457618a85..abf15ef171f5fdafd656ebd7fd319198c8bcd83e 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/AbstractAcpForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractAcpForm.class.php
@@ -115,7 +115,7 @@ abstract class AbstractAcpForm extends AbstractForm
                 I18nHandler::getInstance()->setOptions(
                     $fieldName,
                     $value->getPackageID(),
-                    $databaseObject->{$fieldName},
+                    $databaseObject->{$fieldName} ?? '',
                     "{$value->getLanguageItem()}\\d+"
                 );
             }

diff --git a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
index 747f216cf07409d738b8c31d94bb57cf9b66bf9c..3c9c900bd109804edd9cc5925839a353d74a2efd 100644 (file)
--- a/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/trophy/condition/TrophyConditionHandler.class.php
@@ -84,6 +84,7 @@ class TrophyConditionHandler extends SingletonFactory
                         'trophyID' => $trophy->trophyID,
                         'userID' => $userID,
                         'time' => TIME_NOW,
+                        'description' => '',
                     ],
                 ]))->executeAction();