r81721 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r81720‎ \| r81721 \| r81722 >
Date:	12:13, 8 February 2011
Author:	catrope
Status:	ok
Tags:
Comment:	Fix r81719: trailing commas
Modified paths:	/trunk/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/Resources.php
—	—	@@ -14,45 +14,45 @@
15	15	'skins.vector' => array(
16	16	'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
17	17	'remoteBasePath' => $GLOBALS['wgStylePath'],
18		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	18	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
19	19	),
20	20	'skins.monobook' => array(
21	21	'styles' => array(
22	22	'monobook/main.css' => array( 'media' => 'screen' ),
23	23	),
24	24	'remoteBasePath' => $GLOBALS['wgStylePath'],
25		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	25	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
26	26	),
27	27	'skins.simple' => array(
28	28	'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
29	29	'remoteBasePath' => $GLOBALS['wgStylePath'],
30		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	30	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
31	31	),
32	32	'skins.chick' => array(
33	33	'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
34	34	'remoteBasePath' => $GLOBALS['wgStylePath'],
35		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	35	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
36	36	),
37	37	'skins.modern' => array(
38	38	'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
39	39	'modern/print.css' => array( 'media' => 'print' ) ),
40	40	'remoteBasePath' => $GLOBALS['wgStylePath'],
41		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	41	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
42	42	),
43	43	'skins.cologneblue' => array(
44	44	'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
45	45	'remoteBasePath' => $GLOBALS['wgStylePath'],
46		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	46	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
47	47	),
48	48	'skins.nostalgia' => array(
49	49	'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
50	50	'remoteBasePath' => $GLOBALS['wgStylePath'],
51		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	51	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
52	52	),
53	53	'skins.standard' => array(
54	54	'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
55	55	'remoteBasePath' => $GLOBALS['wgStylePath'],
56		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	56	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
57	57	),
58	58
59	59	/* jQuery */
—	—	@@ -490,7 +490,7 @@
491	491	'mediawiki.legacy.ajax' => array(
492	492	'scripts' => 'common/ajax.js',
493	493	'remoteBasePath' => $GLOBALS['wgStylePath'],
494		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	494	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",,
495	495	'messages' => array(
496	496	'watch',
497	497	'unwatch',
—	—	@@ -504,124 +504,124 @@
505	505	'mediawiki.legacy.block' => array(
506	506	'scripts' => 'common/block.js',
507	507	'remoteBasePath' => $GLOBALS['wgStylePath'],
508		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	508	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",,
509	509	'dependencies' => 'mediawiki.legacy.wikibits',
510	510	),
511	511	'mediawiki.legacy.commonPrint' => array(
512	512	'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
513	513	'remoteBasePath' => $GLOBALS['wgStylePath'],
514		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	514	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",,
515	515	),
516	516	'mediawiki.legacy.config' => array(
517	517	'scripts' => 'common/config.js',
518	518	'styles' => array( 'common/config.css', 'common/config-cc.css' ),
519	519	'remoteBasePath' => $GLOBALS['wgStylePath'],
520		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	520	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
521	521	'dependencies' => 'mediawiki.legacy.wikibits',
522	522	),
523	523	'mediawiki.legacy.diff' => array(
524	524	'scripts' => 'common/diff.js',
525	525	'styles' => 'common/diff.css',
526	526	'remoteBasePath' => $GLOBALS['wgStylePath'],
527		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	527	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
528	528	'dependencies' => 'mediawiki.legacy.wikibits',
529	529	),
530	530	'mediawiki.legacy.edit' => array(
531	531	'scripts' => 'common/edit.js',
532	532	'remoteBasePath' => $GLOBALS['wgStylePath'],
533		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	533	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
534	534	'dependencies' => 'mediawiki.legacy.wikibits',
535	535	),
536	536	'mediawiki.legacy.history' => array(
537	537	'scripts' => 'common/history.js',
538	538	'remoteBasePath' => $GLOBALS['wgStylePath'],
539		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	539	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
540	540	'dependencies' => 'mediawiki.legacy.wikibits',
541	541	),
542	542	'mediawiki.legacy.htmlform' => array(
543	543	'scripts' => 'common/htmlform.js',
544	544	'remoteBasePath' => $GLOBALS['wgStylePath'],
545		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	545	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
546	546	'dependencies' => 'mediawiki.legacy.wikibits',
547	547	),
548	548	'mediawiki.legacy.IEFixes' => array(
549	549	'scripts' => 'common/IEFixes.js',
550	550	'remoteBasePath' => $GLOBALS['wgStylePath'],
551		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	551	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
552	552	'dependencies' => 'mediawiki.legacy.wikibits',
553	553	),
554	554	'mediawiki.legacy.metadata' => array(
555	555	'scripts' => 'common/metadata.js',
556	556	'remoteBasePath' => $GLOBALS['wgStylePath'],
557		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	557	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
558	558	'dependencies' => 'mediawiki.legacy.wikibits',
559	559	'messages' => array( 'metadata-expand', 'metadata-collapse' ),
560	560	),
561	561	'mediawiki.legacy.mwsuggest' => array(
562	562	'scripts' => 'common/mwsuggest.js',
563	563	'remoteBasePath' => $GLOBALS['wgStylePath'],
564		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	564	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
565	565	'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
566	566	'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
567	567	),
568	568	'mediawiki.legacy.password' => array(
569	569	'scripts' => 'common/password.js',
570	570	'remoteBasePath' => $GLOBALS['wgStylePath'],
571		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	571	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
572	572	'styles' => 'common/password.css',
573	573	'dependencies' => 'mediawiki.legacy.wikibits',
574	574	),
575	575	'mediawiki.legacy.prefs' => array(
576	576	'scripts' => 'common/prefs.js',
577	577	'remoteBasePath' => $GLOBALS['wgStylePath'],
578		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	578	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
579	579	'dependencies' => array( 'mediawiki.legacy.wikibits', 'mediawiki.legacy.htmlform' ),
580	580	),
581	581	'mediawiki.legacy.preview' => array(
582	582	'scripts' => 'common/preview.js',
583	583	'remoteBasePath' => $GLOBALS['wgStylePath'],
584		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	584	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
585	585	'dependencies' => 'mediawiki.legacy.wikibits',
586	586	),
587	587	'mediawiki.legacy.protect' => array(
588	588	'scripts' => 'common/protect.js',
589	589	'remoteBasePath' => $GLOBALS['wgStylePath'],
590		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	590	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
591	591	'dependencies' => 'mediawiki.legacy.wikibits',
592	592	),
593	593	'mediawiki.legacy.search' => array(
594	594	'scripts' => 'common/search.js',
595	595	'remoteBasePath' => $GLOBALS['wgStylePath'],
596		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	596	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
597	597	'styles' => 'common/search.css',
598	598	'dependencies' => 'mediawiki.legacy.wikibits',
599	599	),
600	600	'mediawiki.legacy.shared' => array(
601	601	'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
602	602	'remoteBasePath' => $GLOBALS['wgStylePath'],
603		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	603	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
604	604	),
605	605	'mediawiki.legacy.oldshared' => array(
606	606	'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
607	607	'remoteBasePath' => $GLOBALS['wgStylePath'],
608		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	608	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
609	609	),
610	610	'mediawiki.legacy.upload' => array(
611	611	'scripts' => 'common/upload.js',
612	612	'remoteBasePath' => $GLOBALS['wgStylePath'],
613		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	613	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
614	614	'dependencies' => 'mediawiki.legacy.wikibits',
615	615	),
616	616	'mediawiki.legacy.wikibits' => array(
617	617	'scripts' => 'common/wikibits.js',
618	618	'remoteBasePath' => $GLOBALS['wgStylePath'],
619		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	619	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
620	620	'dependencies' => 'mediawiki.language',
621	621	'messages' => array( 'showtoc', 'hidetoc' ),
622	622	),
623	623	'mediawiki.legacy.wikiprintable' => array(
624	624	'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
625	625	'remoteBasePath' => $GLOBALS['wgStylePath'],
626		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins"~~
	626	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
627	627	),
628	628	);

Follow-up revisions

Revision	Commit summary	Author	Date
r81722	Fix double commas from r81721. This time I actually ran it through php -l bef...	catrope	12:14, 8 February 2011
r81723	1.17wmf1: MFT r81719, r81721, r81722	catrope	12:15, 8 February 2011
r85348	Fixes for r85151: grab Resources.php changes for r81719, r81721, r81722, r822...	demon	17:41, 4 April 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r81719	Quick fix to make debug mode work with non-standard $wgStylePath. This strips...	catrope	12:06, 8 February 2011

Status & tagging log

17:41, 4 April 2011 😂 (talk | contribs) changed the tags for r81721 [removed: 1.17]
09:37, 3 April 2011 Catrope (talk | contribs) changed the tags for r81721 [added: 1.17]
07:28, 14 February 2011 Hashar (talk | contribs) changed the status of r81721 [removed: resolved added: ok]
21:46, 8 February 2011 Krinkle (talk | contribs) changed the status of r81721 [removed: fixme added: resolved]
21:46, 8 February 2011 Krinkle (talk | contribs) changed the status of r81721 [removed: new added: fixme]