Merge pull request #217 from Glandos/patch-1

Trim doesn't accept null anymore
This commit is contained in:
Côme Chilliet
2023-01-24 10:26:02 +01:00
committed by GitHub

View File

@@ -66,7 +66,7 @@ abstract class Base extends \OC\User\Backend {
$user = $result->fetch(); $user = $result->fetch();
$result->closeCursor(); $result->closeCursor();
$displayName = trim($user['displayname'], ' '); $displayName = trim($user['displayname'] ?? '', ' ');
if (!empty($displayName)) { if (!empty($displayName)) {
return $displayName; return $displayName;
} else { } else {