Skip to content

Commit 427108b

Browse files
committed
[BUGFIX] Treat FAL storages as case sensitive by default
1 parent 3bfd217 commit 427108b

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

Classes/Domain/Driver/RemoteFileAbstractionLayerDriver.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
use TYPO3\CMS\Core\Resource\Driver\AbstractHierarchicalFilesystemDriver;
3535
use TYPO3\CMS\Core\Resource\Driver\DriverInterface;
3636
use TYPO3\CMS\Core\Resource\Exception\FolderDoesNotExistException;
37+
use TYPO3\CMS\Core\Utility\ArrayUtility;
3738
use TYPO3\CMS\Core\Utility\GeneralUtility;
3839
use TYPO3\CMS\Core\Utility\PathUtility;
3940

@@ -73,7 +74,14 @@ class RemoteFileAbstractionLayerDriver extends AbstractHierarchicalFilesystemDri
7374
*/
7475
public function __construct(array $configuration = array())
7576
{
76-
parent::__construct($configuration);
77+
$defaultConfiguration = array(
78+
'basePath' => '/',
79+
'pathType' => 'relative',
80+
'caseSensitive' => true,
81+
);
82+
ArrayUtility::mergeRecursiveWithOverrule($defaultConfiguration, $configuration);
83+
parent::__construct($defaultConfiguration);
84+
7785
$this->sshConnection = SshConnection::makeInstance();
7886
$this->letterBox = GeneralUtility::makeInstance('In2code\\In2publishCore\\Domain\\Driver\\Rpc\\Letterbox');
7987
}
@@ -115,20 +123,17 @@ public function initialize()
115123
'pathType' => 'relative',
116124
),
117125
);
118-
$this->configuration = array(
119-
'basePath' => '/',
120-
'pathType' => 'relative',
121-
);
122126
} else {
123127
$this->remoteDriverSettings = DatabaseUtility::buildForeignDatabaseConnection()->exec_SELECTgetSingleRow(
124128
'*',
125129
'sys_file_storage',
126130
'uid=' . (int)$this->storageUid
127131
);
128132
$flexFormService = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Service\\FlexFormService');
129-
$this->configuration = $flexFormService->convertFlexFormContentToArray(
133+
$driverConfiguration = $flexFormService->convertFlexFormContentToArray(
130134
$this->remoteDriverSettings['configuration']
131135
);
136+
ArrayUtility::mergeRecursiveWithOverrule($this->configuration, $driverConfiguration);
132137
}
133138
if (!is_array($this->remoteDriverSettings)) {
134139
throw new \LogicException('Could not find the remote storage.', 1474470724);

0 commit comments

Comments
 (0)