gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2023-03-29 20:50:19 +02:00
commit 7fb0acb562
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -260,6 +260,7 @@
- color category (use first 6 chars of md5(category name) as hex color)
- create missing preview images in category or attribute manager
- support README of extension in different languages
- do not force password change if in substitute user mode
--------------------------------------------------------------------------------
Changes in version 5.1.29

2
views/bootstrap/class.UsrMgr.php
View File

@ -307,7 +307,7 @@ $(document).ready( function() {
if($passwordexpiration > 0 && (!$currUser || !$currUser->isAdmin())) {
$options = array();
if($currUser)
$options[] = array('', getMLText("keep"));
$options[] = array('', getMLText("keep").($currUser->getPwdExpiration() ? ' ('.getLongReadableDate($currUser->getPwdExpiration()).')' : ''));
$options[] = array('now', getMLText('now'));
$options[] = array(date('Y-m-d H:i:s', time()+$passwordexpiration*86400), getMLText("according_settings"));
$options[] = array('never', getMLText("never"));