Merge pull request #197 from t3solution/5.1.10

New release v5.1.10
t3solution · Apr 26, 2022 · 0a5cca1 · 0a5cca1
2 parents 41f08a3 + bddc865
commit 0a5cca1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/Classes/Command/CustomScss.php b/Classes/Command/CustomScss.php
@@ -152,7 +152,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			GeneralUtility::writeFile($customFile, $customContent);
 
 			# Custom
-			$customDir = 'fileadmin/T3SB/Resources/Public/SCSS/';
+#			$customDir = 'fileadmin/T3SB/Resources/Public/SCSS/';
+			$customDir = $settings['customScssPath'] ? $settings['customScssPath'] : 'fileadmin/T3SB/Resources/Public/SCSS/';
 			$customPath = GeneralUtility::getFileAbsFileName($customDir);
 
 			$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');

diff --git a/...s/Backend/Controller/ConfigController.php → Classes/Controller/ConfigController.php b/...s/Backend/Controller/ConfigController.php → Classes/Controller/ConfigController.php
diff --git a/.../Backend/Controller/ConsentController.php → Classes/Controller/ConsentController.php b/.../Backend/Controller/ConsentController.php → Classes/Controller/ConsentController.php
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
@@ -7,6 +7,7 @@ module.tx_t3sbootstrap {
 	}
 	settings {
 		customScss = {$bootstrap.extconf.customScss}
+		customScssPath = {$bootstrap.customScssPath}
 		editScss = {$bootstrap.extconf.editScss}
 		bootswatch = {$bootstrap.extconf.bootswatch}
 		bootswatchURL = https://bootswatch.com/5/

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -19,7 +19,7 @@
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author_company' => 't3solution',
-    'version' => '5.1.9',
+    'version' => '5.1.10',
     'constraints' => [
       'depends' => [
         'typo3' => '10.4.18-11.9.99',