Skip to content

[stable19] Use \OC::$CLI instead of PHP_SAPI #21242

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 1 commit into from
Jun 5, 2020
Merged

[stable19] Use \OC::$CLI instead of PHP_SAPI #21242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Use \OC::$CLI instead of PHP_SAPI 
Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@tcitworld @backportbot
tcitworld authored and backportbot[bot] committed Jun 4, 2020
commit 26f72d1aecc3258cbb4a29101de7a34a37ba34e8
2 changes: 1 addition & 1 deletion apps/settings/lib/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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