[TASK] Remove TCA definitions for pre FAL fields 41/31841/4
authorThomas Maroschik <tmaroschik@dfau.de>
Sat, 26 Jul 2014 10:21:19 +0000 (12:21 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 23 Oct 2014 19:39:33 +0000 (21:39 +0200)
There are some overrides in the CMS extension that provide the old
TCA for the image and media fields of tt_content and
pages_language_overlay tables. These apply if the compat version
is set to 6.0 and and FAL upgrade wizard is not yet run.

Those are removed now as we only support migrations from one LTS
to the next LTS.

Resolves: #60594
Releases: master
Change-Id: I40b1b4cbc9404d5f4cac7df27029986a2568f2c8
Reviewed-on: http://review.typo3.org/31841
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/cms/Configuration/TCA/Overrides/pages_language_overlay.php [deleted file]
typo3/sysext/cms/Configuration/TCA/Overrides/tt_content.php [deleted file]

diff --git a/typo3/sysext/cms/Configuration/TCA/Overrides/pages_language_overlay.php b/typo3/sysext/cms/Configuration/TCA/Overrides/pages_language_overlay.php
deleted file mode 100644 (file)
index e536395..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-// Keep old code (pre-FAL) for installations that haven't upgraded yet.
-// @deprecated since TYPO3 6.0, please remove at earliest in TYPO3 6.2
-// existing installation - and files are merged, nothing to do
-if ((!isset($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard']) || !\TYPO3\CMS\Core\Utility\GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard'], 'pages_language_overlay:media')) && !\TYPO3\CMS\Core\Utility\GeneralUtility::compat_version('6.0')) {
-       \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('This installation hasn\'t been migrated to FAL for the field $TCA[pages_language_overlay][columns][media] yet. Please do so before TYPO3 v7.');
-       // Existing installation and no upgrade wizard was executed - and files haven't been merged: use the old code
-       $GLOBALS['TCA']['pages_language_overlay']['columns']['media']['config'] = array(
-               'type' => 'group',
-               'internal_type' => 'file',
-               'allowed' => $GLOBALS['TCA']['pages']['columns']['media']['config']['allowed'],
-               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
-               'uploadfolder' => 'uploads/media',
-               'show_thumbs' => '1',
-               'size' => '3',
-               'maxitems' => '100',
-               'minitems' => '0'
-       );
-}
\ No newline at end of file
diff --git a/typo3/sysext/cms/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/cms/Configuration/TCA/Overrides/tt_content.php
deleted file mode 100644 (file)
index a134898..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-// keep old code (pre-FAL) for installations that haven't upgraded yet. please remove this code in TYPO3 7.0
-// @deprecated since TYPO3 6.0, please remove in TYPO3 7.0
-// existing installation - and files are merged, nothing to do
-if ((!isset($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard']) || !\TYPO3\CMS\Core\Utility\GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard'], 'tt_content:image')) && !\TYPO3\CMS\Core\Utility\GeneralUtility::compat_version('6.0')) {
-       \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('This installation hasn\'t been migrated to FAL for the field $TCA[tt_content][columns][image] yet. Please do so before TYPO3 v7.');
-       // Existing installation and no upgrade wizard was executed - and files haven't been merged: use the old code
-       $GLOBALS['TCA']['tt_content']['columns']['image']['config'] = array(
-               'type' => 'group',
-               'internal_type' => 'file',
-               'allowed' => $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'],
-               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
-               'uploadfolder' => 'uploads/pics',
-               'show_thumbs' => '1',
-               'size' => '3',
-               'maxitems' => '200',
-               'minitems' => '0',
-               'autoSizeMax' => 40
-       );
-}
-
-if ((!isset($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard']) || !\TYPO3\CMS\Core\Utility\GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['TYPO3\\CMS\\Install\\Updates\\TceformsUpdateWizard'], 'tt_content:media')) && !\TYPO3\CMS\Core\Utility\GeneralUtility::compat_version('6.0')) {
-       \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('This installation hasn\'t been migrated to FAL for the field $TCA[tt_content][columns][media] yet. Please do so before TYPO3 v7.');
-       // Existing installation and no upgrade wizard was executed - and files haven't been merged: use the old code
-       $GLOBALS['TCA']['tt_content']['columns']['media']['config'] = array(
-               'type' => 'group',
-               'internal_type' => 'file',
-               'allowed' => '',
-               // Must be empty for disallowed to work.
-               'disallowed' => PHP_EXTENSIONS_DEFAULT,
-               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
-               'uploadfolder' => 'uploads/media',
-               'show_thumbs' => '1',
-               'size' => '3',
-               'maxitems' => '10',
-               'minitems' => '0'
-       );
-}
\ No newline at end of file