From: Tim Düsterhus Date: Tue, 2 Feb 2021 10:39:44 +0000 (+0100) Subject: Fix bad merge / codestyle X-Git-Tag: 5.4.0_Alpha_1~325 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9c5807ade7561ff8ed7be4d1fb250bcdd8d384f;p=GitHub%2FWoltLab%2FWCF.git Fix bad merge / codestyle When resolving the conflict in UserAvatarAction due to 621a83b075404f408dd025dfdc2cc55a43466536 it was forgotten to add the leading backslash. --- diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php index 6cc6b8f134..c0105a077c 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php @@ -176,7 +176,7 @@ class UserAvatarAction extends AbstractDatabaseObjectAction } $data = [ - 'avatarName' => mb_substr($tmp['basename'], 0, 255), + 'avatarName' => \mb_substr($tmp['basename'], 0, 255), 'avatarExtension' => $tmp['extension'], 'width' => $imageData[0], 'height' => $imageData[1],