Commit 245abd15 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Convert suspended date when reloading user object (bug #922031)

Commit 725ba929 tries to reload
certain admin-settable fields from the database into a LiveUser when
committing, but fails to convert the suspended date to a timestamp
when doing so.  This causes the date to be displayed incorrectly to
suspended users when they log in.

The same problem was fixed for expiry dates in commit f7dcdf81

, bug

Change-Id: I3ce83f53183cbd9003226466149f54e878749d1e
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent ce550796
......@@ -1236,7 +1236,7 @@ class LiveUser extends User {
'expiry' => db_format_tsfield('expiry'),
'expirymailsent' => 'expirymailsent',
'inactivemailsent' => 'inactivemailsent',
'suspendedctime' => 'suspendedctime',
'suspendedctime' => db_format_tsfield('suspendedctime'),
'suspendedreason' => 'suspendedreason',
'suspendedcusr' => 'suspendedcusr',
'quota' => 'quota',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment