Commit ee24285d22c824f8e0eece683a168c7da9ee9e95
Merge branch 'tr/bugfix' into tr/publish/preview
* tr/bugfix: global
Showing
1 changed file
with
4 additions
and
2 deletions
Show diff stats
src/services/globald.lua
| @@ -69,7 +69,8 @@ local function mailQuene() | @@ -69,7 +69,8 @@ local function mailQuene() | ||
| 69 | "attachments", email.attachments, | 69 | "attachments", email.attachments, |
| 70 | "endtime", email.endTime, | 70 | "endtime", email.endTime, |
| 71 | "mid", email.mid, | 71 | "mid", email.mid, |
| 72 | - "timestamp", now | 72 | + "timestamp", now, |
| 73 | + "delayType", email.delayType | ||
| 73 | ) | 74 | ) |
| 74 | else | 75 | else |
| 75 | redisproxy:hmset(string_format("globalEmail:%s", gid), | 76 | redisproxy:hmset(string_format("globalEmail:%s", gid), |
| @@ -80,7 +81,8 @@ local function mailQuene() | @@ -80,7 +81,8 @@ local function mailQuene() | ||
| 80 | "content", email.content, | 81 | "content", email.content, |
| 81 | "attachments", email.attachments, | 82 | "attachments", email.attachments, |
| 82 | "endtime", email.endTime, | 83 | "endtime", email.endTime, |
| 83 | - "timestamp", now | 84 | + "timestamp", now, |
| 85 | + "delayType", email.delayType | ||
| 84 | ) | 86 | ) |
| 85 | end | 87 | end |
| 86 | end | 88 | end |