[BUGFIX] fileadmin is hardcoded in install tool 40/25640/4
authorEric Chavaillaz <eric.chavaillaz@gmail.com>
Fri, 22 Nov 2013 13:29:43 +0000 (14:29 +0100)
committerMarkus Klein <klein.t3@mfc-linz.at>
Tue, 17 Dec 2013 00:50:56 +0000 (01:50 +0100)
In the class "DefaultFactory", "fileadmin" is hardcoded.
The function "getDefaultStructureDefinition"
must take care of the $GLOBALS['TYPO3_CONF_VARS']
['BE']['fileadminDir'] configuration variable.

Resolves: #53872
Releases: 6.2
Change-Id: I17c836a58ea70d218170a33e28ca578bb50eef0b
Reviewed-on: https://review.typo3.org/25640
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Stefan Neufeind
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
Reviewed-by: Markus Klein
Tested-by: Markus Klein
typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php

index 9759aa6..5ddd1b5 100644 (file)
@@ -212,7 +212,7 @@ class DefaultFactory {
                                        ),
                                ),
                                array(
-                                       'name' => 'fileadmin',
+                                       'name' => !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? rtrim($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') : 'fileadmin',
                                        'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
                                        'targetPermission' => $directoryPermission,
                                        'children' => array(