(bug 25124) Resource loader should respect $wgStyleDirectory

* Yay, one down, one resourceloader 1.0 blocker to go

diff --git a/resources/Resources.php b/resources/Resources.php
index 7756c7d..2469b75 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -18,45 +18,45 @@ return array(
                'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
                'scripts' => 'vector/vector.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.monobook' => array(
                'styles' => array(
                        'monobook/main.css' => array( 'media' => 'screen' ),
                ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.simple' => array(
                'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.chick' => array(
                'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.modern' => array(
                'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
                                'modern/print.css' => array( 'media' => 'print' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.cologneblue' => array(
                'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.nostalgia' => array(
                'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.standard' => array(
                'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
 
        /* jQuery */
@@ -589,56 +589,56 @@ return array(
        'mediawiki.legacy.ajax' => array(
                'scripts' => 'common/ajax.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.commonPrint' => array(
                'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'mediawiki.legacy.config' => array(
                'scripts' => 'common/config.js',
                'styles' => array( 'common/config.css', 'common/config-cc.css' ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.diff' => array(
                'styles' => 'common/diff.css',
                'group' => 'mediawiki.action.history',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'mediawiki.legacy.edit' => array(
                'scripts' => 'common/edit.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.IEFixes' => array(
                'scripts' => 'common/IEFixes.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.mwsuggest' => array(
                'scripts' => 'common/mwsuggest.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
                'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
        ),
        'mediawiki.legacy.preview' => array(
                'scripts' => 'common/preview.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'common/protect.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
                        'mediawiki.legacy.wikibits',
                        'jquery.byteLimit',
@@ -647,36 +647,36 @@ return array(
        'mediawiki.legacy.search' => array(
                'scripts' => 'common/search.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'styles' => 'common/search.css',
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.shared' => array(
                'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'mediawiki.legacy.oldshared' => array(
                'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'mediawiki.legacy.upload' => array(
                'scripts' => 'common/upload.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
        'mediawiki.legacy.wikibits' => array(
                'scripts' => 'common/wikibits.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.language',
                'messages' => array( 'showtoc', 'hidetoc' ),
        ),
        'mediawiki.legacy.wikiprintable' => array(
                'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => "{$GLOBALS['IP']}/skins",
+               'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
 );