PMCORE-2704

2021-01-18 09:59:59 -04:00
parent 18248b004c
commit 8309325353
2 changed files with 13 additions and 1 deletions
--- a/workflow/engine/src/ProcessMaker/Util/helpers.php
+++ b/workflow/engine/src/ProcessMaker/Util/helpers.php
@@ -617,7 +617,7 @@ function applyMaskDateEnvironment(string $date, $mask = '')
        $systemConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
        $mask = isset($systemConf->aConfig['dateFormat']) ? $systemConf->aConfig['dateFormat'] : '';
    }
-    if (!empty($date)) {
+    if (!empty($date) && !empty($mask)) {
        $date = new DateTime($date);
        $result = $date->format($mask);
    } else {