mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 15:22:17 +02:00
Merge branch 'support/3.0' into develop
# Conflicts: # datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
This commit is contained in:
@@ -25,6 +25,7 @@ use AttributeText;
|
|||||||
use Closure;
|
use Closure;
|
||||||
use Dict;
|
use Dict;
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use IssueLog;
|
||||||
use Twig\Environment;
|
use Twig\Environment;
|
||||||
use Twig\Extension\AbstractExtension;
|
use Twig\Extension\AbstractExtension;
|
||||||
use Twig\Loader\FilesystemLoader;
|
use Twig\Loader\FilesystemLoader;
|
||||||
@@ -168,6 +169,7 @@ class AppExtension extends AbstractExtension
|
|||||||
$filters[] = new TwigFilter('filter', function ($array, $arrow) {
|
$filters[] = new TwigFilter('filter', function ($array, $arrow) {
|
||||||
$ret = $this->SanitizeFilter($array, $arrow);
|
$ret = $this->SanitizeFilter($array, $arrow);
|
||||||
if ($ret !== false) {
|
if ($ret !== false) {
|
||||||
|
IssueLog::Error('Twig "filter" filter has limited capabilities');
|
||||||
return [$ret];
|
return [$ret];
|
||||||
}
|
}
|
||||||
$oEnv = new Environment(new FilesystemLoader());
|
$oEnv = new Environment(new FilesystemLoader());
|
||||||
@@ -175,13 +177,16 @@ class AppExtension extends AbstractExtension
|
|||||||
});
|
});
|
||||||
// Since 2.7.8 deactivate map
|
// Since 2.7.8 deactivate map
|
||||||
$filters[] = new TwigFilter('map', function ($array, $arrow) {
|
$filters[] = new TwigFilter('map', function ($array, $arrow) {
|
||||||
|
IssueLog::Error('Twig "map" filter is deactivated');
|
||||||
return $array;
|
return $array;
|
||||||
});
|
});
|
||||||
// Since 2.7.8 deactivate reduce
|
// Since 2.7.8 deactivate reduce
|
||||||
$filters[] = new TwigFilter('reduce', function ($array, $arrow, $initial = null) {
|
$filters[] = new TwigFilter('reduce', function ($array, $arrow, $initial = null) {
|
||||||
|
IssueLog::Error('Twig "reduce" filter is deactivated');
|
||||||
return $array;
|
return $array;
|
||||||
});
|
});
|
||||||
$filters[] = new TwigFilter('sort', function ($array, $arrow, $initial = null) {
|
$filters[] = new TwigFilter('sort', function ($array, $arrow, $initial = null) {
|
||||||
|
IssueLog::Error('Twig "sort" filter is deactivated');
|
||||||
return $array;
|
return $array;
|
||||||
});
|
});
|
||||||
return $filters;
|
return $filters;
|
||||||
|
|||||||
Reference in New Issue
Block a user