From 70e69daffad6cd4689e695260b01760155c363a1 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Fri, 5 May 2023 15:06:03 +0200 Subject: [PATCH] Revert previous changes. --- .../com_templates/src/Helper/TemplateHelper.php | 8 ++++---- .../components/com_templates/src/Model/TemplateModel.php | 8 ++++---- .../com_templates/src/View/Template/HtmlView.php | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/administrator/components/com_templates/src/Helper/TemplateHelper.php b/administrator/components/com_templates/src/Helper/TemplateHelper.php index 3d7b26ec47366..e62967e4da56a 100644 --- a/administrator/components/com_templates/src/Helper/TemplateHelper.php +++ b/administrator/components/com_templates/src/Helper/TemplateHelper.php @@ -91,10 +91,10 @@ public static function canUpload($file, $err = '') $format = strtolower(File::getExt($file['name'])); - $imageTypes = explode(',', $params->get('image_formats') ?? ''); - $sourceTypes = explode(',', $params->get('source_formats') ?? ''); - $fontTypes = explode(',', $params->get('font_formats') ?? ''); - $archiveTypes = explode(',', $params->get('compressed_formats') ?? ''); + $imageTypes = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp')); + $sourceTypes = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json')); + $fontTypes = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf')); + $archiveTypes = explode(',', $params->get('compressed_formats', 'zip')); $allowable = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes); diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php index 0d45b56dd8330..e75946afbd990 100644 --- a/administrator/components/com_templates/src/Model/TemplateModel.php +++ b/administrator/components/com_templates/src/Model/TemplateModel.php @@ -1774,10 +1774,10 @@ protected function checkFormat($ext) { if (!isset($this->allowedFormats)) { $params = ComponentHelper::getParams('com_templates'); - $imageTypes = explode(',', $params->get('image_formats') ?? ''); - $sourceTypes = explode(',', $params->get('source_formats') ?? ''); - $fontTypes = explode(',', $params->get('font_formats') ?? ''); - $archiveTypes = explode(',', $params->get('compressed_formats') ?? ''); + $imageTypes = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp')); + $sourceTypes = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json')); + $fontTypes = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf')); + $archiveTypes = explode(',', $params->get('compressed_formats', 'zip')); $this->allowedFormats = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes); $this->allowedFormats = array_map('strtolower', $this->allowedFormats); diff --git a/administrator/components/com_templates/src/View/Template/HtmlView.php b/administrator/components/com_templates/src/View/Template/HtmlView.php index c41fcaaf0a32e..c0dc0059af1eb 100644 --- a/administrator/components/com_templates/src/View/Template/HtmlView.php +++ b/administrator/components/com_templates/src/View/Template/HtmlView.php @@ -175,10 +175,10 @@ public function display($tpl = null) $this->stylesHTML = ''; $params = ComponentHelper::getParams('com_templates'); - $imageTypes = explode(',', $params->get('image_formats') ?? ''); - $sourceTypes = explode(',', $params->get('source_formats') ?? ''); - $fontTypes = explode(',', $params->get('font_formats') ?? ''); - $archiveTypes = explode(',', $params->get('compressed_formats') ?? ''); + $imageTypes = explode(',', $params->get('image_formats', 'gif,bmp,jpg,jpeg,png,webp')); + $sourceTypes = explode(',', $params->get('source_formats', 'txt,less,ini,xml,js,php,css,scss,sass,json')); + $fontTypes = explode(',', $params->get('font_formats', 'woff,woff2,ttf,otf')); + $archiveTypes = explode(',', $params->get('compressed_formats', 'zip')); if (in_array($ext, $sourceTypes)) { $this->form = $this->get('Form');