composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 00:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Molkobain
2022-02-02 11:20:58 +01:00
parent 22f9d16743 6a4ce3c3b1
commit 60c372f535
24 changed files with 568 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
View File

@@ -19,6 +19,7 @@
namespace Combodo\iTop\Portal\Twig;
use AttributeDate;
use Twig\Extension\AbstractExtension;
use AttributeDateTime;
@@ -76,6 +77,10 @@ class AppExtension extends AbstractExtension
{
return AttributeDateTime::GetFormat()->Format($sDate);
}
if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
{
return AttributeDate::GetFormat()->Format($sDate);
}
}
catch (Exception $e)
{