[TASK] Remove deprecated inlcude_once array in ClickMenuController 05/32905/2
authorWouter Wolters <typo3@wouterwolters.nl>
Sun, 21 Sep 2014 19:38:07 +0000 (21:38 +0200)
committerMarkus Klein <klein.t3@reelworx.at>
Sun, 21 Sep 2014 20:28:28 +0000 (22:28 +0200)
Resolves: #61781
Releases: master
Change-Id: I0ad4479fb733288d170ee3a06e778ff4890ecd6e
Reviewed-on: http://review.typo3.org/32905
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
typo3/alt_clickmenu.php
typo3/sysext/backend/Classes/Controller/ClickMenuController.php

index ea1abe4..e99228a 100644 (file)
 require __DIR__ . '/init.php';
 
 $clickMenuController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ClickMenuController');
-
-/**
- * Include files for extra click menu options
- * @deprecated since 6.1, will be removed 2 versions later
- */
-foreach ($SOBE->include_once as $INC_FILE) {
-       include_once $INC_FILE;
-}
-
 $clickMenuController->main();
-$clickMenuController->printContent();
+$clickMenuController->printContent();
\ No newline at end of file
index 272e67c..c30c040 100644 (file)
@@ -56,13 +56,6 @@ class ClickMenuController {
         */
        public $doc;
 
-       /**
-        * Files to include_once() - set in init() function
-        *
-        * @deprecated since 6.1, will be removed 2 versions later
-        */
-       public $include_once = array();
-
        // Internal array of classes for extending the clickmenu
        /**
         * @todo Define visibility
@@ -100,18 +93,7 @@ class ClickMenuController {
                }
                // Setting internal array of classes for extending the clickmenu:
                $this->extClassArray = $GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'];
-               // Traversing that array and setting files for inclusion:
-               // @deprecated since 6.1, will be removed 2 versions later
-               if (is_array($this->extClassArray)) {
-                       foreach ($this->extClassArray as $extClassConf) {
-                               if (isset($extClassConf['path'])) {
-                                       GeneralUtility::deprecationLog(
-                                               '$GLOBALS[\'TBE_MODULES_EXT\'][\'xMOD_alt_clickmenu\'][\'extendCMclasses\'][\'path\'] option is not needed anymore. The autoloader takes care of loading the class.'
-                                       );
-                                       $this->include_once[] = $extClassConf['path'];
-                               }
-                       }
-               }
+
                // Initialize template object
                if (!$this->ajax) {
                        $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');