Commit 96c3f7d4e19ba5d889b51e2559a3746d575734cd
Merge branch 'tr/bugfix' into tr/publish/preview
* tr/bugfix: email
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/actions/EmailAction.lua
... | ... | @@ -50,7 +50,7 @@ function _M.listRpc(agent, data) |
50 | 50 | end |
51 | 51 | if flag and ( not email.mid or tonum(email.mid) == mid ) |
52 | 52 | and ( not email.endtime or tonum(email.endtime) > now )then |
53 | - local time = math.max(tonum(email.timestamp, 0) or email.createtime) | |
53 | + local time = math.max(tonum(email.timestamp, 0) , email.createtime) | |
54 | 54 | redisproxy:insertEmail({ |
55 | 55 | roleId = roleId, |
56 | 56 | emailId = 0, | ... | ... |