Revert previous changes.

joomla · May 5, 2023 · 70e69da · 70e69da
1 parent b374ddd
commit 70e69da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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');