diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index b2fa825cf63b..b325dd4e3dae 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -169,6 +169,9 @@ class ImportController extends Controller $enc = mb_detect_encoding($data, mb_list_encodings(), true); + nlog("env"); + nlog($enc); + if($enc !== false) { $data = mb_convert_encoding($data, "UTF-8", $enc); } diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index 89482765fade..8d64912bf0d4 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -126,7 +126,7 @@ class TemplateService $allowedTags = ['if', 'for', 'set', 'filter']; $allowedFilters = ['escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency','map', 'join', 'first', 'date','sum']; $allowedFunctions = ['range', 'cycle', 'constant', 'date',]; - $allowedProperties = []; + $allowedProperties = ['type_id']; $allowedMethods = ['img','t']; $policy = new \Twig\Sandbox\SecurityPolicy($allowedTags, $allowedFilters, $allowedFunctions, $allowedProperties, $allowedMethods);