Merge branch 'master' into feature_Upgrade-to-TYPO3-11

Configuration/TCA/Overrides/pages.php

@@ -130,7 +130,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 			tx_sgnews_teaser2_image, tx_sgnews_teaser1_image,
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.abstract;abstract,
-			seo_title,canonical_link, description,
+			seo_title,canonical_link, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'description,') . '
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.appearance,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.layout;layout,
 		--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
@@ -153,7 +153,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
 			tx_projectbase_devnullrobots_flags,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.abstract;abstract,
-			tx_projectbase_seo_titletag,tx_projectbase_seo_canonicaltag, description,
+			tx_projectbase_seo_titletag,tx_projectbase_seo_canonicaltag, ' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'description,') . '
 		--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.appearance,
 			--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.layout;layout,
 		--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
@@ -452,7 +452,7 @@ if (version_compare(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExten
 $GLOBALS['TCA']['pages']['palettes']['titleDescriptionAndHighlightFlag'] = [
 	'showitem' => 'subtitle;' . $localLangDbPath . 'pages.subtitle.inPalette,
 	--linebreak--, title,
-	--linebreak--, description,
+	' . (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('yoast_seo') ? '':'--linebreak--, description,') . '
 	--linebreak--, slug,
 	--linebreak--, tx_projectbase_path_segment, tx_projectbase_excludefromsluggeneration,
 	--linebreak--, tx_realurl_pathsegment, tx_realurl_exclude,

composer.json

@@ -6,7 +6,7 @@
     "license": [
         "GPL-2.0-or-later"
     ],
-    "version": "9.5.2",
+    "version": "9.5.3",
     "support": {
     },
     "repositories": [

ext_emconf.php

@@ -19,7 +19,7 @@ $EM_CONF['sg_news'] = [
 	'modify_tables' => '',
 	'clearCacheOnLoad' => 0,
 	'lockType' => '',
-	'version' => '9.5.2',
+	'version' => '9.5.3',
 	'constraints' => [
 		'depends' => [
 			'typo3' => '10.4.99',