Merge "Update monolog/monolog from 1.22.1 -> 1.24.0"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderOOUIModule.php

diff --git a/includes/resourceloader/ResourceLoaderOOUIModule.php b/includes/resourceloader/ResourceLoaderOOUIModule.php
index a3f7b5b..0395127 100644 (file)
--- a/includes/resourceloader/ResourceLoaderOOUIModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIModule.php
@@ -55,14 +55,14 @@ trait ResourceLoaderOOUIModule {
        // Note that keys must be TitleCase.
        protected static $builtinThemePaths = [
                'WikimediaUI' => [
-                       'scripts' => 'resources/lib/oojs-ui/oojs-ui-wikimediaui.js',
-                       'styles' => 'resources/lib/oojs-ui/oojs-ui-{module}-wikimediaui.css',
-                       'images' => 'resources/lib/oojs-ui/themes/wikimediaui/{module}.json',
+                       'scripts' => 'resources/lib/ooui/oojs-ui-wikimediaui.js',
+                       'styles' => 'resources/lib/ooui/oojs-ui-{module}-wikimediaui.css',
+                       'images' => 'resources/lib/ooui/themes/wikimediaui/{module}.json',
                ],
                'Apex' => [
-                       'scripts' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
-                       'styles' => 'resources/lib/oojs-ui/oojs-ui-{module}-apex.css',
-                       'images' => 'resources/lib/oojs-ui/themes/apex/{module}.json',
+                       'scripts' => 'resources/lib/ooui/oojs-ui-apex.js',
+                       'styles' => 'resources/lib/ooui/oojs-ui-{module}-apex.css',
+                       'images' => 'resources/lib/ooui/themes/apex/{module}.json',
                ],
        ];
 
@@ -104,7 +104,7 @@ trait ResourceLoaderOOUIModule {
         */
        protected function getThemePath( $theme, $kind, $module ) {
                $paths = self::getThemePaths();
-               $path = $paths[ $theme ][ $kind ];
+               $path = $paths[$theme][$kind];
                $path = str_replace( '{module}', $module, $path );
                return $path;
        }