|
|
|
|
@ -219,7 +219,7 @@ class Setting extends Base { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected function getUserSettings($uid, $app) { |
|
|
|
|
protected function getUserSettings(string $uid, string $app): array { |
|
|
|
|
$settings = $this->config->getAllUserValues($uid); |
|
|
|
|
if ($app !== '') { |
|
|
|
|
if (isset($settings[$app])) { |
|
|
|
|
@ -230,7 +230,10 @@ class Setting extends Base { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$user = $this->userManager->get($uid); |
|
|
|
|
$settings['settings']['display_name'] = $user->getDisplayName(); |
|
|
|
|
if ($user !== null) { |
|
|
|
|
// Only add the display name if the user exists |
|
|
|
|
$settings['settings']['display_name'] = $user->getDisplayName(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $settings; |
|
|
|
|
} |
|
|
|
|
|