Merge "registration: Apply ResourceFileModulePaths to all modules"

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index bf42aba..a2dcd59 100644 (file)
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -197,7 +197,7 @@ class ExtensionProcessor implements Processor {
                                if ( isset( $data['localBasePath'] ) ) {
                                        $data['localBasePath'] = "$dir/{$data['localBasePath']}";
                                }
-                               if ( $defaultPaths && !isset( $data['class'] ) ) {
+                               if ( $defaultPaths ) {
                                        $data += $defaultPaths;
                                }
                                $this->globals['wgResourceModules'][$name] = $data;

diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index d2254df..b4c225c 100644 (file)
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -249,11 +249,14 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
                                                'test.class' => array(
                                                        'class' => 'FooBarModule',
                                                        'extra' => 'argument',
+                                                       'localBasePath' => $dir,
+                                                       'remoteExtPath' => 'FooBar',
                                                ),
                                                'test.class.with.path' => array(
                                                        'class' => 'FooBarPathModule',
                                                        'extra' => 'argument',
                                                        'localBasePath' => $dir,
+                                                       'remoteExtPath' => 'FooBar',
                                                )
                                        ),
                                ),