Merge pull request #50 from Sofatraining/v12-dev

V12 dev to V12 main
Sofatraining · Jul 23, 2024 · fe00f42 · fe00f42
2 parents 3bb6d69 + cb971b0
commit fe00f42
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -83,5 +83,8 @@ Bugfixes
 ***
 #### v3.0.3
 Bugfixes, Font Awesome to Version 6.5.2, Update to Bootstrap 5.3.3, Adding CE Stoerer.html
-
+***
+#### v3.0.4
+Update composer.json, Update ext_emconf.php, Update ext_localconf.php, Update PageTitleProvider.php
+
 ***   
diff --git a/Classes/PageTitle/PageTitleProvider.php b/Classes/PageTitle/PageTitleProvider.php
@@ -5,12 +5,23 @@
 
 class LiepsPageTitleProvider extends AbstractPageTitleProvider
 {
-	public function __construct()
-	{	
-		$this->title = '';
-		$page = $GLOBALS['TSFE']->page;
-		$separator = ' :';
-		$this->title .= $page['title'];
-		$this->title .= $separator;
-	}
+    public function __construct()
+    {    
+        $this->title = '';
+        $page = $GLOBALS['TSFE']->page;
+        $separator = ' :';
+
+        // Überprüfen, ob ein SEO-Titel gesetzt ist
+        $seoTitle = $page['seo_title'] ?? '';
+
+        if (!empty($seoTitle)) {
+            // Wenn der SEO-Titel gesetzt ist, diesen verwenden
+            $this->title .= $seoTitle;
+        } else {
+            // Ansonsten den Standard-Seitentitel verwenden
+            $this->title .= $page['title'];
+        }
+
+        $this->title .= $separator;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -29,7 +29,10 @@
         "php": ">=8.0.0 <=8.2.99",
         "typo3/cms-core": "^12.4",
         "typo3/cms-rte-ckeditor": "^12.4",
-        "typo3/cms-fluid-styled-content": "^12.4"
+        "typo3/cms-fluid-styled-content": "^12.4",
+        "contentblocks/content-blocks": "^0.7.15",
+        "fluidtypo3/vhs": "^7.0.0",
+        "fluidtypo3/flux": "^10.0.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -7,7 +7,7 @@
     'title' => 'LIEPS TYPO3 Defaults',
     'description' => 'Bootstrap 5 Extension + Various Content Elements with Flux',
     'category' => 'fe',
-    'version' => '3.0.3',
+    'version' => '3.0.4',
     'state' => 'stable',
     'uploadfolder' => false,
     'createDirs' => '',
@@ -21,8 +21,8 @@
             array (
                 'typo3' => '11.5.0-12.4.99',
                 'content_blocks' => '0.7.14-0.7.99',
-                'flux' => '10.0.7-10.0.99',
-                'vhs' => '7.0.0-7.3.99',
+                'flux' => '10.0.10-10.0.99',
+                'vhs' => '7.0.3-7.0.99',
             ),
         'conflicts' => 
             array (

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -12,3 +12,6 @@
 
 \FluidTYPO3\Flux\Core::registerProviderExtensionKey('LiepsGmbH.Liepstypo3defaults', 'Page');
 \FluidTYPO3\Flux\Core::registerProviderExtensionKey('LiepsGmbH.Liepstypo3defaults', 'Content');
+
+// Setzen der Konstante [GFX][imagefile_ext]
+$GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] = 'gif,jpg,jpeg,tif,tiff,bmp,pcx,tga,png,pdf,ai,svg,webp';