From 1f979c58b937a493f0658b86f0834904264dbebd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Nov 2018 10:52:31 +0100 Subject: [PATCH] Use the substract function instead of manual math Signed-off-by: Joas Schilling --- lib/MailQueueHandler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php index 36c6e129c..1eb5ebedb 100644 --- a/lib/MailQueueHandler.php +++ b/lib/MailQueueHandler.php @@ -231,11 +231,11 @@ protected function getAffectedUsers($limit, $latestSend, $forceSending, $restric if ($restrictEmails !== null) { if ($restrictEmails === UserSettings::EMAIL_SEND_HOURLY) { - $query->where($query->expr()->eq('amq_timestamp', $query->createFunction($query->getColumnName('amq_latest_send') . ' - ' . 3600))); + $query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600)))); } else if ($restrictEmails === UserSettings::EMAIL_SEND_DAILY) { - $query->where($query->expr()->eq('amq_timestamp', $query->createFunction($query->getColumnName('amq_latest_send') . ' - ' . 3600 * 24))); + $query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600 * 24)))); } else if ($restrictEmails === UserSettings::EMAIL_SEND_WEEKLY) { - $query->where($query->expr()->eq('amq_timestamp', $query->createFunction($query->getColumnName('amq_latest_send') . ' - ' . 3600 * 24 * 7))); + $query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600 * 24 * 7)))); } else if ($restrictEmails === UserSettings::EMAIL_SEND_ASAP) { $query->where($query->expr()->eq('amq_timestamp', 'amq_latest_send')); }