[TASK] Remove unneeded function call in TYPO3 Bootstrap 95/37995/5
authorBenjamin Mack <benni@typo3.org>
Sun, 22 Mar 2015 12:43:54 +0000 (13:43 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Sun, 22 Mar 2015 16:38:43 +0000 (17:38 +0100)
The method "loadAdditionalConfigurationFromExtensions()"
inside the TYPO3 Bootstrap is just used as a wrapper
now for calling the extLocalconf method itself,
and only used within the Bootstrap class within the boostrap->loadTypo3LoadedExtAndExtLocalconf() method.

Resolves: #65892
Releases: master
Change-Id: I993221e2152ee9b0128dd61379828789fe033a2e
Reviewed-on: http://review.typo3.org/37995
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/core/Classes/Core/Bootstrap.php

index daf3b09..d44c0c6 100644 (file)
@@ -496,7 +496,7 @@ class Bootstrap {
         * @internal This is not a public API method, do not use in own extensions
         */
        public function loadTypo3LoadedExtAndExtLocalconf($allowCaching = TRUE) {
-               $this->loadAdditionalConfigurationFromExtensions($allowCaching);
+               Utility\ExtensionManagementUtility::loadExtLocalconf($allowCaching);
                return $this;
        }
 
@@ -785,20 +785,6 @@ class Bootstrap {
                return $this;
        }
 
-       /**
-        * Load extension configuration files (ext_localconf.php)
-        *
-        * The ext_localconf.php files in extensions are meant to make changes
-        * to the global $TYPO3_CONF_VARS configuration array.
-        *
-        * @param bool $allowCaching
-        * @return Bootstrap
-        */
-       protected function loadAdditionalConfigurationFromExtensions($allowCaching = TRUE) {
-               Utility\ExtensionManagementUtility::loadExtLocalconf($allowCaching);
-               return $this;
-       }
-
        /**
         * Initialize exception handling
         * This method is called twice. First when LocalConfiguration has been loaded