Skip to content

[stable26] Add IProvideEnabledStateBackend interface #44063

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

Closed
backportbot wants to merge 9 commits into from
Closed

[stable26] Add IProvideEnabledStateBackend interface #44063

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2cad3f0
Add user enabled state backend feature
come-nc Oct 5, 2022
a964817
Use the new IProvideEnabledStateBackend interface in user_ldap
come-nc Oct 5, 2022
c77a299
[user_ldap] Add per-connection setting for marking remnants as disabled
come-nc May 23, 2023
fa430fe
Fix user tests, avoid setting enabled state to the same value
come-nc May 23, 2023
cd793fc
Fix autoloaders
come-nc May 25, 2023
8dd8353
Use DI for DeletedUsersIndex and fix tests
come-nc May 25, 2023
fd6cc17
Fix User_Proxy tests as well
come-nc May 25, 2023
ca93a54
Fix since annotations and add boolean return type for setUserEnabled
come-nc Jun 20, 2023
f5f4e19
Add method to list disabled users to IProvideEnabledStateBackend
come-nc Jun 29, 2023
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
Next Next commit
Fix user tests, avoid setting enabled state to the same value 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Mar 7, 2024
commit fa430fe03e596c55b2bc11a4a006a370a9313184
7 changes: 4 additions & 3 deletions lib/private/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,11 @@ public function setEnabled(bool $enabled = true) {
return (bool) $this->enabled;
};
$this->backend->setUserEnabled($this->uid, $enabled, $queryDatabaseValue, $setDatabaseValue);
} else {
if ($oldStatus !== $enabled) {
$this->triggerChange('enabled', $enabled, $oldStatus);
}
} elseif ($oldStatus !== $enabled) {
$setDatabaseValue($enabled);
}
if ($oldStatus !== $enabled) {
$this->triggerChange('enabled', $enabled, $oldStatus);
}
}
Expand Down