From d17890f05b15d6d442fc333d1bc47738148a50a9 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:57:41 +0200 Subject: [PATCH] FIX: purge files cron: php warnings when rest module enabled (#30919) --- htdocs/core/class/conf.class.php | 1 + htdocs/core/class/utils.class.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 44a510ef157..f92b1397f61 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -161,6 +161,7 @@ class Conf $this->mailing = new stdClass(); $this->expensereport = new stdClass(); $this->productbatch = new stdClass(); + $this->api = new stdClass(); } /** diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index d983d061203..5e2ecdf055e 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -133,7 +133,13 @@ class Utils $result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted); - if (!in_array($filesarray[$key]['fullname'], array($conf->api->dir_temp, $conf->user->dir_temp))) { // The 2 directories $conf->api->dir_temp and $conf->user->dir_temp are recreated at end, so we do not count them + $recreatedDirs = array($conf->user->dir_temp); + + if (isModEnabled('api')) { + $recreatedDirs[] = $conf->api->dir_temp; + } + + if (!in_array($filesarray[$key]['fullname'], $recreatedDirs)) { // The 2 directories $conf->api->dir_temp and $conf->user->dir_temp are recreated at end, so we do not count them $count += $result; $countdeleted += $tmpcountdeleted; }