fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-2704 (pull request #7743)

Browse Source 
PMCORE-2704

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2021-01-18 14:40:46 +00:00
committed by Julio Cesar Laura Avendaño
parent c3aa410aa4 8309325353
commit b22e08f8ed
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/ApplyMaskDateEnvironmentTest.php
View File

@@ -17,4 +17,16 @@ class ApplyMaskDateEnvironmentTest extends TestCase
$expected = '2020/11/12'; $expected = '2020/11/12';
$this->assertEquals($expected, applyMaskDateEnvironment($date1, 'Y/m/d')); $this->assertEquals($expected, applyMaskDateEnvironment($date1, 'Y/m/d'));
} }
/**
* When the mask is empty will return the same date
*
* @test
*/
public function it_should_return_date_without_mask()
{
$date1 = date("2020-11-12 09:09:10");
$expected = '2020-11-12 09:09:10';
$this->assertEquals($expected, applyMaskDateEnvironment($date1));
}
} }

2
workflow/engine/src/ProcessMaker/Util/helpers.php
View File

@@ -617,7 +617,7 @@ function applyMaskDateEnvironment(string $date, $mask = '')
$systemConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', ''); $systemConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
$mask = isset($systemConf->aConfig['dateFormat']) ? $systemConf->aConfig['dateFormat'] : ''; $mask = isset($systemConf->aConfig['dateFormat']) ? $systemConf->aConfig['dateFormat'] : '';
} }
if (!empty($date)) { if (!empty($date) && !empty($mask)) {
$date = new DateTime($date); $date = new DateTime($date);
$result = $date->format($mask); $result = $date->format($mask);
} else { } else {