diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php index cee31099c751512d24696f89be8065c528beddaa..a89916cc659cd6c8269ae03e7054be71e715f6d2 100644 --- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php +++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php @@ -260,13 +260,6 @@ class FrontendBackendUserAuthentication extends BackendUserAuthentication ->from('pages') ->where( $queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($id, \PDO::PARAM_INT)), - $queryBuilder->expr()->in( - 'doktype', - $queryBuilder->createNamedParameter( - $GLOBALS['TYPO3_CONF_VARS']['FE']['content_doktypes'], - \PDO::PARAM_INT - ) - ), QueryHelper::stripLogicalOperatorPrefix($perms_clause) ) ->execute(); diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php index 526a7059b8a2ade1a9a5bb5765eebc1056eee4eb..b9705f08aa9b0b817d3cf513eacd0147dd0f5b98 100644 --- a/typo3/sysext/core/Configuration/DefaultConfiguration.php +++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php @@ -1025,7 +1025,6 @@ return [ // array('IPmaskList_1','fe_group uid'), array('IPmaskList_2','fe_group uid') ], 'get_url_id_token' => '#get_URL_ID_TOK#', - 'content_doktypes' => '1,2,5,7', 'enable_mount_pids' => true, 'hidePagesIfNotTranslatedByDefault' => false, 'eID_include' => [], // Array of key/value pairs where key is "tx_[ext]_[optional suffix]" and value is relative filename of class to include. Key is used as "?eID=" for \TYPO3\CMS\Frontend\Http\RequestHandlerRequestHandler to include the code file which renders the page from that point. (Useful for functionality that requires a low initialization footprint, eg. frontend ajax applications) diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml index be6523c67fe69e4833d20ce9943b73ecf0ba3191..1c4b6d180e5cd88a0fed9c6c1712ef39eb4eeec9 100644 --- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml +++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml @@ -415,9 +415,6 @@ FE: get_url_id_token: type: text description: 'This is the token, which is substituted in the output code in order to keep a GET-based session going. Normally the GET-session-id is 5 chars (''&ftu='') + hash_length (norm. 10)' - content_doktypes: - type: list - description: 'List of pages.doktype values which can contain content (so shortcut pages and external url pages are excluded, but all pages below doktype 199 should be included. doktype=6 is not either (backend users only...).' enable_mount_pids: type: bool description: 'If enabled, the mount_pid feature allowing ''symlinks'' in the page tree (for frontend operation) is allowed.' diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82803-GlobalConfigurationOptionContent_doktypesRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82803-GlobalConfigurationOptionContent_doktypesRemoved.rst new file mode 100644 index 0000000000000000000000000000000000000000..64d98e7d40f393121446121fbc445d6971e85006 --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82803-GlobalConfigurationOptionContent_doktypesRemoved.rst @@ -0,0 +1,35 @@ +.. include:: ../../Includes.txt + +========================================================================= +Breaking: #82803 - Global configuration option "content_doktypes" removed +========================================================================= + +See :issue:`82803` + +Description +=========== + +The configuration option :php:`$TYPO3_CONF_VARS['FE']['content_doktypes']` which declared +what pages.doktypes values could contain content elements, was removed. + + +Impact +====== + +Using this option in custom code will lead to unexpected behaviour. + +Changing this option has no effect on TYPO3 Core anymore. + + +Affected Installations +====================== + +Installations having this option explicitly set. + + +Migration +========= + +Remove all usages working with this option. + +.. index:: LocalConfiguration, NotScanned \ No newline at end of file diff --git a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php index ad0bbee25bbf009031c67d99e7e6ea7dc1f8fde8..5837868b6cd3400acf102622565629f5b443f017 100644 --- a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php +++ b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php @@ -118,6 +118,8 @@ class SilentConfigurationUpgradeService 'SYS/enableDeprecationLog', // #82680 'GFX/png_truecolor', + // #82803 + 'FE/content_doktypes', ]; public function __construct(ConfigurationManager $configurationManager = null) diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php index abf888bf89a946d43483cb03e590d453597e447c..3428030d3d0da5ff10552ad4f5df39e851ba1218 100644 --- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php +++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php @@ -816,10 +816,7 @@ class WorkspaceService implements SingletonInterface if ($pageUid > 0 && $workspaceUid > 0) { $pageRecord = BackendUtility::getRecord('pages', $pageUid); BackendUtility::workspaceOL('pages', $pageRecord, $workspaceUid); - if ( - !GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['FE']['content_doktypes'], $pageRecord['doktype']) - || VersionState::cast($pageRecord['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER) - ) { + if (VersionState::cast($pageRecord['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) { $result = false; } } else {