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

This commit is contained in:
Molkobain
2022-02-02 11:20:58 +01:00
24 changed files with 568 additions and 62 deletions

View File

@@ -7,6 +7,7 @@
namespace Combodo\iTop\Application\TwigBase\Twig;
use AttributeDate;
use AttributeDateTime;
use AttributeText;
use Combodo\iTop\Application\UI\Base\iUIBlock;
@@ -56,6 +57,10 @@ class Extension
{
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)
{