Merge branch '1.6.x'

2026-10-18 05:51:26 +02:00 · 2016-11-27 15:09:56 +01:00
parent b8bc119a84 c7cd6f292d
commit 4ff657b389
1 changed files with 1 additions and 1 deletions
@@ -63,7 +63,7 @@ class AliasesMap(object):
        "SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr "
        "INNER JOIN admin_alias AS al ON alr.alias_id=al.id "
        "WHERE al.enabled=1 AND al.address='%s' AND "
-        "(al.expire_at IS NULL OR al.expire_at>now())"
+        "(al.expire_at IS NULL OR al.expire_at>datetime('now'))"
    )