[TASK] Remove not needed require for language service
authorHelmut Hummel <helmut.hummel@typo3.org>
Mon, 19 Nov 2012 19:24:17 +0000 (20:24 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 19 Nov 2012 19:32:22 +0000 (20:32 +0100)
The Bootstrap still contains a require statement
for the language service, which can now perfectly be
loaded by the autoloader.

Resolves: #43115
Releases: 6.0

Change-Id: I04eacb1e459f4e7f1e14a46597cdbee7a1ce7a74
Reviewed-on: http://review.typo3.org/16579
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/cli_dispatch.phpsh
typo3/init.php
typo3/install/index.php
typo3/sysext/cms/tslib/index_ts.php
typo3/sysext/core/Classes/Core/Bootstrap.php

index f96e090..55ac772 100755 (executable)
@@ -69,7 +69,6 @@ require __DIR__ . '/sysext/core/Classes/Core/Bootstrap.php';
        ->loadAdditionalConfigurationFromExtensions(TRUE)
        ->deprecationLogForOldExtCacheSetting()
        ->initializeExceptionHandling()
-       ->requireAdditionalExtensionFiles()
        ->setFinalCachingFrameworkCacheConfiguration()
        ->defineLoggingAndExceptionConstants()
        ->unsetReservedGlobalVariables()
index 698e854..d668232 100644 (file)
@@ -81,7 +81,6 @@ require 'sysext/core/Classes/Core/Bootstrap.php';
        ->loadAdditionalConfigurationFromExtensions(TRUE)
        ->deprecationLogForOldExtCacheSetting()
        ->initializeExceptionHandling()
-       ->requireAdditionalExtensionFiles()
        ->setFinalCachingFrameworkCacheConfiguration()
        ->defineLoggingAndExceptionConstants()
        ->unsetReservedGlobalVariables()
index d8db4dd..ee52c2c 100755 (executable)
@@ -62,7 +62,6 @@ require '../sysext/install/Classes/InstallBootstrap.php';
        ->loadAdditionalConfigurationFromExtensions(FALSE)
        ->deprecationLogForOldExtCacheSetting()
        ->initializeExceptionHandling()
-       ->requireAdditionalExtensionFiles()
        ->setFinalCachingFrameworkCacheConfiguration()
        ->defineLoggingAndExceptionConstants()
        ->unsetReservedGlobalVariables()
index 8d4a287..a1fb73e 100644 (file)
@@ -62,7 +62,6 @@ ob_start();
        ->loadAdditionalConfigurationFromExtensions(TRUE)
        ->deprecationLogForOldExtCacheSetting()
        ->initializeExceptionHandling()
-       ->requireAdditionalExtensionFiles()
        ->setFinalCachingFrameworkCacheConfiguration()
        ->defineLoggingAndExceptionConstants()
        ->unsetReservedGlobalVariables();
index abe2528..6f1559a 100644 (file)
@@ -487,16 +487,6 @@ class Bootstrap {
        }
 
        /**
-        * Load some additional classes that are encapsulated in extensions
-        *
-        * @return \TYPO3\CMS\Core\Core\Bootstrap
-        */
-       public function requireAdditionalExtensionFiles() {
-               require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('lang') . 'lang.php';
-               return $this;
-       }
-
-       /**
         * Extensions may register new caches, so we set the
         * global cache array to the manager again at this point
         *