Skip to content

[stable17] Fix password reset saying Admin changed my password when reset from login page #21231

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
rullzer merged 2 commits into from
Jun 4, 2020
Merged

[stable17] Fix password reset saying Admin changed my password when reset from login page #21231

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb066ce
Fix password reset saying Admin changed my password when reset from
tcitworld Apr 10, 2020
bdb6589
Use \OC::$CLI instead of PHP_SAPI
tcitworld Jun 4, 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
Use \OC::$CLI instead of PHP_SAPI 
Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@tcitworld
tcitworld committed Jun 4, 2020
commit bdb6589482beac25423ff2604818ff3cad06d9a9
2 changes: 1 addition & 1 deletion settings/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function onChangePassword($uid) {
->setSubject(Provider::PASSWORD_CHANGED_SELF);
}
} else {
if (PHP_SAPI === 'cli') {
if (\OC::$CLI) {
// Admin used occ to reset the password
$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
$event->setSubject(Provider::PASSWORD_RESET);
Expand Down