From d484614c0ffc60435ba49b80ae45bb51ab5b5cad Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 13 Feb 2019 14:03:22 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02016=20-=20Fix=20Issue=20with=20"ExecAsy?= =?UTF-8?q?ncTask:=20async=5Ftask=5Fretries"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/asynctask.class.inc.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/asynctask.class.inc.php b/core/asynctask.class.inc.php index 5c7d8d2c6..73e33dd1d 100644 --- a/core/asynctask.class.inc.php +++ b/core/asynctask.class.inc.php @@ -150,7 +150,7 @@ abstract class AsyncTask extends DBObject public function GetRetryDelay($iErrorCode = null) { $iRetryDelay = 600; - $aRetries = MetaModel::GetConfig()->Get('async_task_retries', array()); + $aRetries = MetaModel::GetConfig()->Get('async_task_retries'); if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries)) { $aConfig = $aRetries[get_class($this)]; @@ -162,12 +162,13 @@ abstract class AsyncTask extends DBObject public function GetMaxRetries($iErrorCode = null) { $iMaxRetries = 0; - $aRetries = MetaModel::GetConfig()->Get('async_task_retries', array()); + $aRetries = MetaModel::GetConfig()->Get('async_task_retries'); if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries)) { $aConfig = $aRetries[get_class($this)]; $iMaxRetries = $aConfig['max_retries']; } + return $iMaxRetries; } /** @@ -380,6 +381,6 @@ class AsyncSendEmail extends AsyncTask case EMAIL_SEND_ERROR: return "Failed: ".implode(', ', $aIssues); } + return ''; } } -?>