[TASK] Remove auto-creation of uploads folder 95/54895/2
authorBenni Mack <benni@typo3.org>
Thu, 30 Nov 2017 21:10:33 +0000 (22:10 +0100)
committerMarkus Klein <markus.klein@typo3.org>
Sat, 2 Dec 2017 19:42:08 +0000 (20:42 +0100)
For new plain TYPO3 installations, the uploads/ folder
is not needed anymore, as the TYPO3 core does not
use the uploads/ (internal_type=file) functionality
anymore, but uses the File Abstraction Layer completely.

Resolves: #83182
Releases: master
Change-Id: Idc99d72b91aaeff5a39a1ef353cc8cc6583dced6
Reviewed-on: https://review.typo3.org/54895
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
INSTALL.md
typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
typo3/sysext/install/Classes/Report/InstallStatusReport.php
typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html [deleted file]

index 26870bb..4a731ff 100644 (file)
@@ -265,7 +265,7 @@ and gives you some suggestions on what to change in case there are any
 discrepancies.
 
 The Install Tool will create the required directory structure for you
-(typo3conf, uploads, fileadmin, typo3temp).
+(typo3conf, fileadmin, typo3temp).
 
 TYPO3 Security
 --------------
index e547652..5203ba3 100644 (file)
@@ -154,32 +154,6 @@ class DefaultFactory
                 ],
             ],
             [
-                'name' => 'uploads',
-                'type' => DirectoryNode::class,
-                'targetPermission' => $directoryPermission,
-                'children' => [
-                    [
-                        'name' => 'index.html',
-                        'type' => FileNode::class,
-                        'targetPermission' => $filePermission,
-                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html',
-                    ],
-                    [
-                        'name' => 'media',
-                        'type' => DirectoryNode::class,
-                        'targetPermission' => $directoryPermission,
-                        'children' => [
-                            [
-                                'name' => 'index.html',
-                                'type' => FileNode::class,
-                                'targetPermission' => $filePermission,
-                                'targetContent' => '',
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            [
                 'name' => !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? rtrim($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') : 'fileadmin',
                 'type' => DirectoryNode::class,
                 'targetPermission' => $directoryPermission,
index ad24af0..4984c95 100644 (file)
@@ -72,8 +72,6 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
             'typo3conf/' => 2,
             'typo3conf/ext/' => 0,
             'typo3conf/l10n/' => 0,
-            'uploads/' => 2,
-            'uploads/media/' => 0,
             $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] => -1,
             $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/' => 0,
         ];
diff --git a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html
deleted file mode 100644 (file)
index d44be3d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-       <TITLE></TITLE>
-<META http-equiv=Refresh Content="0; Url=../">
-</HEAD>
-</HTML>
\ No newline at end of file