Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2023-03-29 20:59:06 +02:00
commit dc642fa898

View File

@ -122,7 +122,7 @@ if($isajax)
* to be changed redirect to out/out.ForcePasswordChange.php. Do this * to be changed redirect to out/out.ForcePasswordChange.php. Do this
* check only if password expiration is turned on, we are not on the * check only if password expiration is turned on, we are not on the
* page to change the password or the page that changes the password, the * page to change the password or the page that changes the password, the
* current user is not admin, and no user substiation has occured. */ * current user is not admin, and no user substitution has occured. */
if (!$user->isAdmin() && $origuser == null) { if (!$user->isAdmin() && $origuser == null) {
if($settings->_passwordExpiration > 0) { if($settings->_passwordExpiration > 0) {