r92348 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r92347‎ | r92348 | r92349 >
Date:08:57, 16 July 2011
Author:hashar
Status:deferred
Tags:
Comment:
MFT to REL1_18:
r89615: RL should respect $wgStyleDirectory
r89707, r89708: fix bug 28983
r90087,r90826: small doc fixes
r90099, r90102: 'isMainPage' only defined on Main_Page!
r90125: user_email index for SQLite
r90217: bug 29091 fix Ossetic language name
r90835: unreak maintenance scripts
Modified paths:
  • /branches/REL1_18/phase3/includes/Article.php (modified) (history)
  • /branches/REL1_18/phase3/includes/BacklinkCache.php (modified) (history)
  • /branches/REL1_18/phase3/includes/OutputPage.php (modified) (history)
  • /branches/REL1_18/phase3/includes/installer/Installer.php (modified) (history)
  • /branches/REL1_18/phase3/includes/installer/SqliteUpdater.php (modified) (history)
  • /branches/REL1_18/phase3/languages/Names.php (modified) (history)
  • /branches/REL1_18/phase3/maintenance/archives/patch-user_email_index.sql (modified) (history)
  • /branches/REL1_18/phase3/maintenance/compareParsers.php (modified) (history)
  • /branches/REL1_18/phase3/maintenance/preprocessDump.php (modified) (history)
  • /branches/REL1_18/phase3/maintenance/rebuildImages.php (modified) (history)
  • /branches/REL1_18/phase3/maintenance/upgrade1_5.php (modified) (history)
  • /branches/REL1_18/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/maintenance/archives/patch-user_email_index.sql
——@@ -1 +1 @@
2 - ALTER TABLE /*$wgDBprefix*/user ADD INDEX ( `user_email`(50), `user_name` );
\ No newline at end of file
 2+CREATE INDEX /*i*/user_email ON /*_*/user (user_email(50),user_name);
\ No newline at end of file
Property changes on: branches/REL1_18/phase3/maintenance/archives/patch-user_email_index.sql
___________________________________________________________________
Added: svn:mergeinfo
33 Merged /branches/sqlite/maintenance/archives/patch-user_email_index.sql:r58211-58321
44 Merged /trunk/phase3/maintenance/archives/patch-user_email_index.sql:r87627-87628,87630,87998,88134,88231-88232,88250,88513,89099,89108,90125,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
55 Merged /branches/iwtransclusion/phase3/maintenance/archives/patch-user_email_index.sql:r69540
66 Merged /branches/new-installer/phase3/maintenance/archives/patch-user_email_index.sql:r43664-66004
77 Merged /branches/REL1_15/phase3/maintenance/archives/patch-user_email_index.sql:r51646
Index: branches/REL1_18/phase3/maintenance/upgrade1_5.php
——@@ -1324,4 +1324,4 @@
13251325 }
13261326
13271327 $maintClass = 'FiveUpgrade';
1328 -require( RUN_MAINTENANCE_IF_MAIN );
 1328+require_once( RUN_MAINTENANCE_IF_MAIN );
Property changes on: branches/REL1_18/phase3/maintenance/upgrade1_5.php
___________________________________________________________________
Added: svn:mergeinfo
13291329 Merged /branches/new-installer/phase3/maintenance/upgrade1_5.php:r43664-66004
13301330 Merged /branches/REL1_15/phase3/maintenance/upgrade1_5.php:r51646
13311331 Merged /branches/REL1_17/phase3/maintenance/upgrade1_5.php:r81445,81448
13321332 Merged /branches/sqlite/maintenance/upgrade1_5.php:r58211-58321
13331333 Merged /trunk/phase3/maintenance/upgrade1_5.php:r87586,87627-87628,87630,87632,87636,87640,87644,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88750,89099,89108,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90835
Index: branches/REL1_18/phase3/maintenance/preprocessDump.php
——@@ -24,7 +24,7 @@
2525 * @file
2626 * @ingroup Maintenance
2727 */
28 -
 28+
2929 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
3030
3131 class PreprocessDump extends Maintenance {
——@@ -40,7 +40,7 @@
4141 global $wgParser;
4242 return $wgParser->getStripList();
4343 }
44 -
 44+
4545 public function __construct() {
4646 parent::__construct();
4747 $this->saveFailed = false;
——@@ -83,7 +83,7 @@
8484 $wgPreprocessorCacheThreshold = false;
8585 $this->saveFailed = $this->getOption('save-failed');
8686 }
87 -
 87+
8888 if ( $this->hasOption( 'preprocessor' ) ) {
8989 $name = $this->getOption( 'preprocessor' );
9090 } elseif ( isset( $wgParserConf['preprocessorClass'] ) ) {
——@@ -129,7 +129,7 @@
130130 # It is only available since 5.2.0 (since 5.2.1 if you haven't compiled with --enable-memory-limit)
131131 $this->error( "Memory peak usage of " . memory_get_peak_usage() . " bytes\n" );
132132 }
133 -
 133+
134134 /**
135135 * Callback function for each revision, preprocessToObj()
136136 * @param $rev Revision
Property changes on: branches/REL1_18/phase3/maintenance/preprocessDump.php
___________________________________________________________________
Added: svn:mergeinfo
137137 Merged /branches/REL1_15/phase3/maintenance/preprocessDump.php:r51646
138138 Merged /branches/REL1_17/phase3/maintenance/preprocessDump.php:r81445,81448
139139 Merged /branches/sqlite/maintenance/preprocessDump.php:r58211-58321
140140 Merged /trunk/phase3/maintenance/preprocessDump.php:r87586,87627-87628,87630,87632,87636,87640,87644,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88750,89099,89108,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90835
141141 Merged /branches/new-installer/phase3/maintenance/preprocessDump.php:r43664-66004
Index: branches/REL1_18/phase3/maintenance/rebuildImages.php
——@@ -219,4 +219,4 @@
220220 }
221221
222222 $maintClass = 'ImageBuilder';
223 -require( RUN_MAINTENANCE_IF_MAIN );
 223+require_once( RUN_MAINTENANCE_IF_MAIN );
Property changes on: branches/REL1_18/phase3/maintenance/rebuildImages.php
___________________________________________________________________
Added: svn:mergeinfo
224224 Merged /branches/new-installer/phase3/maintenance/rebuildImages.php:r43664-66004
225225 Merged /branches/REL1_15/phase3/maintenance/rebuildImages.php:r51646
226226 Merged /branches/REL1_17/phase3/maintenance/rebuildImages.php:r81445,81448
227227 Merged /branches/sqlite/maintenance/rebuildImages.php:r58211-58321
228228 Merged /trunk/phase3/maintenance/rebuildImages.php:r87586,87627-87628,87630,87632,87636,87640,87644,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88750,89099,89108,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90835
Property changes on: branches/REL1_18/phase3/maintenance/compareParsers.php
___________________________________________________________________
Added: svn:mergeinfo
229229 Merged /branches/REL1_17/phase3/maintenance/compareParsers.php:r81445,81448
230230 Merged /branches/sqlite/maintenance/compareParsers.php:r58211-58321
231231 Merged /trunk/phase3/maintenance/compareParsers.php:r87586,87627-87628,87630,87632,87636,87640,87644,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88750,89099,89108,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90835
232232 Merged /branches/new-installer/phase3/maintenance/compareParsers.php:r43664-66004
233233 Merged /branches/REL1_15/phase3/maintenance/compareParsers.php:r51646
Index: branches/REL1_18/phase3/includes/Article.php
——@@ -45,7 +45,7 @@
4646 var $mRedirectTarget = null;
4747
4848 /**
49 - * @var Title
 49+ * @var mixed: boolean false or URL string
5050 */
5151 var $mRedirectUrl = false; // !<
5252 var $mRevIdFetched = 0; // !<
Property changes on: branches/REL1_18/phase3/includes/Article.php
___________________________________________________________________
Added: svn:mergeinfo
5353 Merged /branches/sqlite/includes/Article.php:r58211-58321
5454 Merged /trunk/phase3/includes/Article.php:r87586,87627-87628,87630,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,89099,89108,90087,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
5555 Merged /branches/new-installer/phase3/includes/Article.php:r43664-66004
5656 Merged /branches/wmf-deployment/includes/Article.php:r53381
5757 Merged /branches/REL1_15/phase3/includes/Article.php:r51646
Index: branches/REL1_18/phase3/includes/OutputPage.php
——@@ -2661,7 +2661,6 @@
26622662 'wgUserGroups' => $this->getUser()->getEffectiveGroups(),
26632663 'wgCategories' => $this->getCategories(),
26642664 'wgBreakFrames' => $this->getFrameOptions() == 'DENY',
2665 - 'wgIsMainPage' => $title->isMainPage(),
26662665 );
26672666 if ( $wgContLang->hasVariants() ) {
26682667 $vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
——@@ -2672,6 +2671,9 @@
26732672 if ( $wgUseAjax && $wgEnableMWSuggest && !$this->getUser()->getOption( 'disablesuggest', false ) ) {
26742673 $vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $this->getUser() );
26752674 }
 2675+ if ( $title->isMainPage() ) {
 2676+ $vars['wgIsMainPage'] = true;
 2677+ }
26762678
26772679 // Allow extensions to add their custom variables to the global JS variables
26782680 wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
Property changes on: branches/REL1_18/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
26792681 Merged /trunk/phase3/includes/OutputPage.php:r90099,90102
Index: branches/REL1_18/phase3/includes/installer/Installer.php
——@@ -1219,7 +1219,6 @@
12201220 global $IP;
12211221 $exts = $this->getVar( '_Extensions' );
12221222 $IP = $this->getVar( 'IP' );
1223 - $path = $IP . '/extensions';
12241223
12251224 /**
12261225 * We need to include DefaultSettings before including extensions to avoid
——@@ -1235,7 +1234,7 @@
12361235 require( "$IP/includes/DefaultSettings.php" );
12371236
12381237 foreach( $exts as $e ) {
1239 - require_once( "$path/$e/$e.php" );
 1238+ require_once( "$IP/extensions/$e/$e.php" );
12401239 }
12411240
12421241 $hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ?
Property changes on: branches/REL1_18/phase3/includes/installer/Installer.php
___________________________________________________________________
Added: svn:mergeinfo
12431242 Merged /branches/new-installer/phase3/includes/installer/Installer.php:r43664-66004
12441243 Merged /branches/wmf-deployment/includes/installer/Installer.php:r53381
12451244 Merged /branches/REL1_15/phase3/includes/installer/Installer.php:r51646
12461245 Merged /branches/sqlite/includes/installer/Installer.php:r58211-58321
12471246 Merged /trunk/phase3/includes/installer/Installer.php:r87586,87627-87628,87630,87706,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88658,89099,89108,89707-89708,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
Index: branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
——@@ -52,6 +52,9 @@
5353 array( 'doCollationUpdate' ),
5454 array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
5555 array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
 56+
 57+ // 1.18
 58+ array( 'addIndex', 'user', 'user_email', 'patch-user_email_index.sql' ),
5659 );
5760 }
5861
Property changes on: branches/REL1_18/phase3/includes/installer/SqliteUpdater.php
___________________________________________________________________
Added: svn:mergeinfo
5962 Merged /branches/sqlite/includes/installer/SqliteUpdater.php:r58211-58321
6063 Merged /trunk/phase3/includes/installer/SqliteUpdater.php:r87586,87627-87628,87630,87706,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88658,89099,89108,90125,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
6164 Merged /branches/new-installer/phase3/includes/installer/SqliteUpdater.php:r43664-66004
6265 Merged /branches/wmf-deployment/includes/installer/SqliteUpdater.php:r53381
6366 Merged /branches/REL1_15/phase3/includes/installer/SqliteUpdater.php:r51646
Index: branches/REL1_18/phase3/includes/BacklinkCache.php
——@@ -253,7 +253,7 @@
254254
255255 /**
256256 * Partition the backlinks into batches.
257 - * Returns an array giving the start and end of each range. The firsti
 257+ * Returns an array giving the start and end of each range. The first
258258 * batch has a start of false, and the last batch has an end of false.
259259 *
260260 * @param $table String: the links table name
——@@ -262,7 +262,7 @@
263263 */
264264 public function partition( $table, $batchSize ) {
265265
266 - // 1) try this per process cache first
 266+ // 1) try partition cache ...
267267
268268 if ( isset( $this->partitionCache[$table][$batchSize] ) ) {
269269 wfDebug( __METHOD__ . ": got from partition cache\n" );
——@@ -272,7 +272,7 @@
273273 $this->partitionCache[$table][$batchSize] = false;
274274 $cacheEntry =& $this->partitionCache[$table][$batchSize];
275275
276 - // 2) try full result cache
 276+ // 2) ... then try full result cache ...
277277
278278 if ( isset( $this->fullResultCache[$table] ) ) {
279279 $cacheEntry = $this->partitionResult( $this->fullResultCache[$table], $batchSize );
Property changes on: branches/REL1_18/phase3/includes/BacklinkCache.php
___________________________________________________________________
Added: svn:mergeinfo
280280 Merged /branches/sqlite/includes/BacklinkCache.php:r58211-58321
281281 Merged /trunk/phase3/includes/BacklinkCache.php:r87586,87627-87628,87630,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,89099,89108,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90826
282282 Merged /branches/new-installer/phase3/includes/BacklinkCache.php:r43664-66004
283283 Merged /branches/wmf-deployment/includes/BacklinkCache.php:r53381
284284 Merged /branches/REL1_15/phase3/includes/BacklinkCache.php:r51646
Index: branches/REL1_18/phase3/languages/Names.php
——@@ -249,7 +249,7 @@
250250 'oc' => 'Occitan', # Occitan
251251 'om' => 'Oromoo', # Oromo
252252 'or' => 'ଓଡ଼ିଆ', # Oriya
253 - 'os' => 'Иронау', # Ossetic
 253+ 'os' => 'Ирон', # Ossetic -- fixed per bug 29091
254254 'pa' => 'ਪੰਜਾਬੀ', # Eastern Punjabi (Gurmukhi script) (pan)
255255 'pag' => 'Pangasinan', # Pangasinan
256256 'pam' => 'Kapampangan', # Pampanga
Property changes on: branches/REL1_18/phase3/languages/Names.php
___________________________________________________________________
Added: svn:mergeinfo
257257 Merged /branches/REL1_17/phase3/languages/Names.php:r81445,81448
258258 Merged /branches/nikola/phase3/languages/Names.php:r85224,85239,85308
259259 Merged /branches/sqlite/languages/Names.php:r58211-58321
260260 Merged /trunk/phase3/languages/Names.php:r87627-87628,87630,87632,87636,87640,87644,87998,88134,88231-88232,88250,88513,89099,89108,90217,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
261261 Merged /branches/new-installer/phase3/languages/Names.php:r43664-66004
262262 Merged /branches/REL1_15/phase3/languages/Names.php:r51646
Index: branches/REL1_18/phase3/resources/Resources.php
——@@ -17,45 +17,45 @@
1818 'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
1919 'scripts' => 'vector/vector.js',
2020 'remoteBasePath' => $GLOBALS['wgStylePath'],
21 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 21+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
2222 ),
2323 'skins.monobook' => array(
2424 'styles' => array(
2525 'monobook/main.css' => array( 'media' => 'screen' ),
2626 ),
2727 'remoteBasePath' => $GLOBALS['wgStylePath'],
28 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 28+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
2929 ),
3030 'skins.simple' => array(
3131 'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
3232 'remoteBasePath' => $GLOBALS['wgStylePath'],
33 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 33+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
3434 ),
3535 'skins.chick' => array(
3636 'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
3737 'remoteBasePath' => $GLOBALS['wgStylePath'],
38 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 38+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
3939 ),
4040 'skins.modern' => array(
4141 'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
4242 'modern/print.css' => array( 'media' => 'print' ) ),
4343 'remoteBasePath' => $GLOBALS['wgStylePath'],
44 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 44+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
4545 ),
4646 'skins.cologneblue' => array(
4747 'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
4848 'remoteBasePath' => $GLOBALS['wgStylePath'],
49 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 49+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5050 ),
5151 'skins.nostalgia' => array(
5252 'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
5353 'remoteBasePath' => $GLOBALS['wgStylePath'],
54 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 54+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
5555 ),
5656 'skins.standard' => array(
5757 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
5858 'remoteBasePath' => $GLOBALS['wgStylePath'],
59 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 59+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
6060 ),
6161
6262 /* jQuery */
——@@ -535,7 +535,7 @@
536536 'mediawiki.legacy.ajax' => array(
537537 'scripts' => 'common/ajax.js',
538538 'remoteBasePath' => $GLOBALS['wgStylePath'],
539 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 539+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
540540 'messages' => array(
541541 'watch',
542542 'unwatch',
——@@ -549,13 +549,13 @@
550550 'mediawiki.legacy.commonPrint' => array(
551551 'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
552552 'remoteBasePath' => $GLOBALS['wgStylePath'],
553 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 553+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
554554 ),
555555 'mediawiki.legacy.config' => array(
556556 'scripts' => 'common/config.js',
557557 'styles' => array( 'common/config.css', 'common/config-cc.css' ),
558558 'remoteBasePath' => $GLOBALS['wgStylePath'],
559 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 559+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
560560 'dependencies' => 'mediawiki.legacy.wikibits',
561561 ),
562562 'mediawiki.legacy.diff' => array(
——@@ -563,39 +563,39 @@
564564 'styles' => 'common/diff.css',
565565 'group' => 'mediawiki.action.history',
566566 'remoteBasePath' => $GLOBALS['wgStylePath'],
567 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 567+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
568568 'dependencies' => 'mediawiki.legacy.wikibits',
569569 'position' => 'top',
570570 ),
571571 'mediawiki.legacy.edit' => array(
572572 'scripts' => 'common/edit.js',
573573 'remoteBasePath' => $GLOBALS['wgStylePath'],
574 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 574+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
575575 'dependencies' => 'mediawiki.legacy.wikibits',
576576 ),
577577 'mediawiki.legacy.IEFixes' => array(
578578 'scripts' => 'common/IEFixes.js',
579579 'remoteBasePath' => $GLOBALS['wgStylePath'],
580 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 580+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
581581 'dependencies' => 'mediawiki.legacy.wikibits',
582582 ),
583583 'mediawiki.legacy.mwsuggest' => array(
584584 'scripts' => 'common/mwsuggest.js',
585585 'remoteBasePath' => $GLOBALS['wgStylePath'],
586 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 586+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
587587 'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
588588 'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
589589 ),
590590 'mediawiki.legacy.preview' => array(
591591 'scripts' => 'common/preview.js',
592592 'remoteBasePath' => $GLOBALS['wgStylePath'],
593 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 593+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
594594 'dependencies' => 'mediawiki.legacy.wikibits',
595595 ),
596596 'mediawiki.legacy.protect' => array(
597597 'scripts' => 'common/protect.js',
598598 'remoteBasePath' => $GLOBALS['wgStylePath'],
599 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 599+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
600600 'dependencies' => array(
601601 'mediawiki.legacy.wikibits',
602602 'jquery.byteLimit',
——@@ -604,36 +604,36 @@
605605 'mediawiki.legacy.search' => array(
606606 'scripts' => 'common/search.js',
607607 'remoteBasePath' => $GLOBALS['wgStylePath'],
608 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 608+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
609609 'styles' => 'common/search.css',
610610 'dependencies' => 'mediawiki.legacy.wikibits',
611611 ),
612612 'mediawiki.legacy.shared' => array(
613613 'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
614614 'remoteBasePath' => $GLOBALS['wgStylePath'],
615 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 615+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
616616 ),
617617 'mediawiki.legacy.oldshared' => array(
618618 'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
619619 'remoteBasePath' => $GLOBALS['wgStylePath'],
620 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 620+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
621621 ),
622622 'mediawiki.legacy.upload' => array(
623623 'scripts' => 'common/upload.js',
624624 'remoteBasePath' => $GLOBALS['wgStylePath'],
625 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 625+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
626626 'dependencies' => 'mediawiki.legacy.wikibits',
627627 ),
628628 'mediawiki.legacy.wikibits' => array(
629629 'scripts' => 'common/wikibits.js',
630630 'remoteBasePath' => $GLOBALS['wgStylePath'],
631 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 631+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
632632 'dependencies' => 'mediawiki.language',
633633 'messages' => array( 'showtoc', 'hidetoc' ),
634634 ),
635635 'mediawiki.legacy.wikiprintable' => array(
636636 'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
637637 'remoteBasePath' => $GLOBALS['wgStylePath'],
638 - 'localBasePath' => "{$GLOBALS['IP']}/skins",
 638+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
639639 ),
640640 );
Property changes on: branches/REL1_18/phase3/resources/Resources.php
___________________________________________________________________
Added: svn:mergeinfo
641641 Merged /branches/sqlite/resources/Resources.php:r58211-58321
642642 Merged /trunk/phase3/resources/Resources.php:r87586,87627-87628,87630,87632,87636,87640,87644,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,88750,89099,89108,89615,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812
643643 Merged /branches/new-installer/phase3/resources/Resources.php:r43664-66004
644644 Merged /branches/REL1_15/phase3/resources/Resources.php:r51646
645645 Merged /branches/REL1_17/phase3/resources/Resources.php:r81445,81448

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r89615(bug 25124) Resource loader should respect $wgStyleDirectory...krinkle22:08, 6 June 2011
r89707quick fix for bug28983 . Do not use $path in the loop. Even the remaining $e ...wikinaut22:30, 7 June 2011
r89708Follow up r89707. No need for the explicit concatenations.platonides22:33, 7 June 2011
r90087Fix one bad doc comment entry from r86848brion21:10, 14 June 2011
r90099Only define 'isMainPage' if we are on the main page, the new mw.config librar...krinkle23:29, 14 June 2011
r90102Using true instead of calling isMainPage() again....krinkle01:11, 15 June 2011
r90125SQLite support for r86485maxsem17:57, 15 June 2011
r90217* (bug 29091) Fix form of native name for Ossetic language (Иронау -> ...brion17:34, 16 June 2011
r90826Fix comment in BacklinkCache::partition()...hashar11:48, 26 June 2011
r90835Unbreak multiple maintenance scriptsnikerabbit15:40, 26 June 2011

Status & tagging log