[TASK] Re-enable loading core_autoload
authorChristian Kuhn <lolli@schwarzbu.ch>
Fri, 24 Aug 2012 12:11:05 +0000 (14:11 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 24 Aug 2012 12:17:36 +0000 (14:17 +0200)
Change-Id: Id553ec6b908ce47cd920d794190d809d0ba16652
Resolves: #40120
Related: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14035
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/core/Classes/Autoloader.php

index e30814b..2503de5 100644 (file)
@@ -133,7 +133,7 @@ class Autoloader {
                $lookUpClassName = ($hasRealClassName = $className !== $realClassName) ? $realClassName : $className;
                // Use core and extension registry
                $classPath = self::getClassPathByRegistryLookup($lookUpClassName);
-               if ($classPath && !class_exists($realClassName, false)) {
+               if ($classPath && !class_exists($realClassName, FALSE)) {
                        // Include the required file that holds the class
                        \TYPO3\CMS\Core\Utility\GeneralUtility::requireOnce($classPath);
                } else {
@@ -147,7 +147,7 @@ class Autoloader {
 
                        }
                }
-               if ($hasRealClassName && !class_exists($className, false)) {
+               if ($hasRealClassName && !class_exists($className, FALSE)) {
                        class_alias($realClassName, $className);
                }
        }
@@ -240,8 +240,7 @@ class Autoloader {
         * @return array
         */
        static protected function createCoreAndExtensionRegistry() {
-               // TODO reenable
-               $classRegistry = array();
+               $classRegistry = require(PATH_t3lib . 'core_autoload.php');
                // At this point during bootstrap the local configuration is initialized,
                // extMgm is ready to get the list of enabled extensions
                foreach (\TYPO3\CMS\Core\Extension\ExtensionManager::getLoadedExtensionListArray() as $extensionKey) {
@@ -367,4 +366,4 @@ class Autoloader {
 }
 
 
-?>
\ No newline at end of file
+?>