Merge "Add tags for undo edits"

[lhc/web/wiklou.git] / includes / registration / ExtensionRegistry.php

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index bc2f8e4..6308461 100644 (file)
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -323,7 +323,7 @@ class ExtensionRegistry {
                }
 
                if ( isset( $info['autoloaderNS'] ) ) {
-                       Autoloader::$psr4Namespaces += $info['autoloaderNS'];
+                       AutoLoader::$psr4Namespaces += $info['autoloaderNS'];
                }
 
                foreach ( $info['defines'] as $name => $val ) {
@@ -413,13 +413,14 @@ class ExtensionRegistry {
         * Fully expand autoloader paths
         *
         * @param string $dir
-        * @param array $info
+        * @param array $files
         * @return array
         */
-       protected function processAutoLoader( $dir, array $info ) {
+       protected function processAutoLoader( $dir, array $files ) {
                // Make paths absolute, relative to the JSON file
-               return array_map( function ( $file ) use ( $dir ) {
-                       return "$dir/$file";
-               }, $info );
+               foreach ( $files as &$file ) {
+                       $file = "$dir/$file";
+               }
+               return $files;
        }
 }