[!!!][TASK][CONF] Remove deprecated code for 4.7
authorMarkus Klein <klein.t3@mfc-linz.at>
Sun, 27 Nov 2011 17:02:33 +0000 (11:02 -0600)
committerSteffen Ritter <info@rs-websystems.de>
Mon, 5 Dec 2011 12:08:17 +0000 (13:08 +0100)
Removes all deprecated code marked for deletion in 4.7.

Change-Id: Ia8fae449d0baa8dd4d35ca22bfd4026abf857bce
Resolves: #32108
Releases: 4.7
Reviewed-on: http://review.typo3.org/6945
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
Reviewed-by: Stefan Neufeind
typo3/sysext/workspaces/Classes/Reports/StatusProvider.php
typo3/sysext/workspaces/tca.php

index b226922..c5ccae0 100644 (file)
@@ -65,8 +65,8 @@ class Tx_Workspaces_Reports_StatusProvider implements tx_reports_StatusProvider
                $value    = 'Element Versioning is in use.';
                $message  = 'All Configuration options have been set correctly';
 
-               if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly'] || $GLOBALS['TYPO3_CONF_VARS']['BE']['newPagesVersioningType'] != -1) {
-                       $severity = tx_reports_reports_status_Status::WARNING;
+               if (isset($GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly']) || isset($GLOBALS['TYPO3_CONF_VARS']['BE']['newPagesVersioningType'])) {
+                       $severity = tx_reports_reports_status_Status::ERROR;
                        $value    = 'System not configured correctly.';
                        $message  = 'This TYPO3 installation is configured to use Element versioning. Page and Branch versioning are deprecated since TYPO3 4.4.<br />If you are sure that you don\'t use the Workspaces functionality right now (or if you don\'t have any versionized records right now), you can safely change these options in the Install Tool by setting ["BE"]["newPagesVersioningType"] = -1 and ["BE"]["elementVersioningOnly"] = 1 under "All Configuration".';
                }
index af479e6..6f2e121 100644 (file)
@@ -367,26 +367,5 @@ $TCA['sys_workspace_stage'] = array(
                )
        )
 );
-// if other versioning options than element versions are active,
-// the TCA column needs to be added as well
-if (isset($GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly'])
-       && !$GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly']) {
-       $additionalWorkspaceTcaColumn = array(
-               'vtypes' => array(
-                       'label' => 'LLL:EXT:lang/locallang_tca.xml:sys_workspace.vtypes',
-                       'config' => array(
-                               'type' => 'check',
-                               'items' => array(
-                                       array('Element', 0),
-                                       array('Page',    0),
-                                       array('Branch',  0)
-                               )
-                       )
-               )
-       );
-       t3lib_extMgm::addTCAcolumns('sys_workspace', $additionalWorkspaceTcaColumn, FALSE);
-       t3lib_extMgm::addToAllTCAtypes('sys_workspace', 'vtypes', '', 'after:swap_modes');
-}
-
 
 ?>