Skip to content

Fix null displayname crash as described in #21885 #23065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
May 25, 2021
Merged

Fix null displayname crash as described in #21885 #23065

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1710b5
Fix null displayname crash as described in #21885
TomG736 Sep 27, 2020
23dbbca
Fix indentation error
TomG736 Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix indentation error 
Signed-off-by: tgrant <[email protected]>
  • Loading branch information
@TomG736
TomG736 committed Mar 17, 2021
commit 23dbbca1a0bc5a99224b8f5e5553042a53aa8767
8 changes: 4 additions & 4 deletions lib/private/Group/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,11 @@ public function countDisabledInGroup(string $gid): int {

public function getDisplayName(string $gid): string {
if (isset($this->groupCache[$gid])) {
$displayName = $this->groupCache[$gid]['displayname'];
$displayName = $this->groupCache[$gid]['displayname'];

if (isset($displayName) && trim($displayName) !== '') {
return $displayName;
}
if (isset($displayName) && trim($displayName) !== '') {
return $displayName;
}
}

$this->fixDI();
Expand Down