r89615 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r89614‎ | r89615 | r89616 >
Date:22:08, 6 June 2011
Author:krinkle
Status:ok (Comments)
Tags:
Comment:
(bug 25124) Resource loader should respect $wgStyleDirectory
* Yay, one down, one resourceloader 1.0 blocker to go
Modified paths:
  • /trunk/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/Resources.php
——@@ -18,45 +18,45 @@
1919 'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
2020 'scripts' => 'vector/vector.js',
2121 'remoteBasePath' => $GLOBALS['wgStylePath'],
22 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 22+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
2323 ),
2424 'skins.monobook' => array(
2525 'styles' => array(
2626 'monobook/main.css' => array( 'media' => 'screen' ),
2727 ),
2828 'remoteBasePath' => $GLOBALS['wgStylePath'],
29 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 29+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
3030 ),
3131 'skins.simple' => array(
3232 'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
3333 'remoteBasePath' => $GLOBALS['wgStylePath'],
34 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 34+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
3535 ),
3636 'skins.chick' => array(
3737 'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
3838 'remoteBasePath' => $GLOBALS['wgStylePath'],
39 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 39+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
4040 ),
4141 'skins.modern' => array(
4242 'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
4343 'modern/print.css' => array( 'media' => 'print' ) ),
4444 'remoteBasePath' => $GLOBALS['wgStylePath'],
45 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 45+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
4646 ),
4747 'skins.cologneblue' => array(
4848 'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
4949 'remoteBasePath' => $GLOBALS['wgStylePath'],
50 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 50+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5151 ),
5252 'skins.nostalgia' => array(
5353 'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
5454 'remoteBasePath' => $GLOBALS['wgStylePath'],
55 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 55+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5656 ),
5757 'skins.standard' => array(
5858 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
5959 'remoteBasePath' => $GLOBALS['wgStylePath'],
60 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 60+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
6161 ),
6262
6363 /* jQuery */
——@@ -589,56 +589,56 @@
590590 'mediawiki.legacy.ajax' => array(
591591 'scripts' => 'common/ajax.js',
592592 'remoteBasePath' => $GLOBALS['wgStylePath'],
593 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 593+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
594594 'dependencies' => 'mediawiki.legacy.wikibits',
595595 ),
596596 'mediawiki.legacy.commonPrint' => array(
597597 'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
598598 'remoteBasePath' => $GLOBALS['wgStylePath'],
599 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 599+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
600600 ),
601601 'mediawiki.legacy.config' => array(
602602 'scripts' => 'common/config.js',
603603 'styles' => array( 'common/config.css', 'common/config-cc.css' ),
604604 'remoteBasePath' => $GLOBALS['wgStylePath'],
605 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 605+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
606606 'dependencies' => 'mediawiki.legacy.wikibits',
607607 ),
608608 'mediawiki.legacy.diff' => array(
609609 'styles' => 'common/diff.css',
610610 'group' => 'mediawiki.action.history',
611611 'remoteBasePath' => $GLOBALS['wgStylePath'],
612 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 612+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
613613 ),
614614 'mediawiki.legacy.edit' => array(
615615 'scripts' => 'common/edit.js',
616616 'remoteBasePath' => $GLOBALS['wgStylePath'],
617 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 617+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
618618 'dependencies' => 'mediawiki.legacy.wikibits',
619619 ),
620620 'mediawiki.legacy.IEFixes' => array(
621621 'scripts' => 'common/IEFixes.js',
622622 'remoteBasePath' => $GLOBALS['wgStylePath'],
623 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 623+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
624624 'dependencies' => 'mediawiki.legacy.wikibits',
625625 ),
626626 'mediawiki.legacy.mwsuggest' => array(
627627 'scripts' => 'common/mwsuggest.js',
628628 'remoteBasePath' => $GLOBALS['wgStylePath'],
629 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 629+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
630630 'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
631631 'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
632632 ),
633633 'mediawiki.legacy.preview' => array(
634634 'scripts' => 'common/preview.js',
635635 'remoteBasePath' => $GLOBALS['wgStylePath'],
636 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 636+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
637637 'dependencies' => 'mediawiki.legacy.wikibits',
638638 ),
639639 'mediawiki.legacy.protect' => array(
640640 'scripts' => 'common/protect.js',
641641 'remoteBasePath' => $GLOBALS['wgStylePath'],
642 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 642+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
643643 'dependencies' => array(
644644 'mediawiki.legacy.wikibits',
645645 'jquery.byteLimit',
——@@ -647,36 +647,36 @@
648648 'mediawiki.legacy.search' => array(
649649 'scripts' => 'common/search.js',
650650 'remoteBasePath' => $GLOBALS['wgStylePath'],
651 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 651+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
652652 'styles' => 'common/search.css',
653653 'dependencies' => 'mediawiki.legacy.wikibits',
654654 ),
655655 'mediawiki.legacy.shared' => array(
656656 'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
657657 'remoteBasePath' => $GLOBALS['wgStylePath'],
658 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 658+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
659659 ),
660660 'mediawiki.legacy.oldshared' => array(
661661 'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
662662 'remoteBasePath' => $GLOBALS['wgStylePath'],
663 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 663+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
664664 ),
665665 'mediawiki.legacy.upload' => array(
666666 'scripts' => 'common/upload.js',
667667 'remoteBasePath' => $GLOBALS['wgStylePath'],
668 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 668+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
669669 'dependencies' => 'mediawiki.legacy.wikibits',
670670 ),
671671 'mediawiki.legacy.wikibits' => array(
672672 'scripts' => 'common/wikibits.js',
673673 'remoteBasePath' => $GLOBALS['wgStylePath'],
674 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 674+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
675675 'dependencies' => 'mediawiki.language',
676676 'messages' => array( 'showtoc', 'hidetoc' ),
677677 ),
678678 'mediawiki.legacy.wikiprintable' => array(
679679 'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
680680 'remoteBasePath' => $GLOBALS['wgStylePath'],
681 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 681+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
682682 ),
683683 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r896761.17: MFT r82247, r87203, r87265, r87494, r87497, r87711, r87840, r88076, r89615catrope19:09, 7 June 2011
r92348MFT to REL1_18:...hashar08:57, 16 July 2011

Comments

#Comment by Brion VIBBER (talk | contribs)   22:38, 6 June 2011

Looks ok, doesn't seem to break anything.

Status & tagging log