r85348 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r85347‎ \| r85348 \| r85349 >
Date:	17:41, 4 April 2011
Author:	demon
Status:	ok
Tags:
Comment:	Fixes for r85151: grab Resources.php changes for r81719, r81721, r81722, r82200 (and drop jpegmeta that snuck in). Also fix L18n cache missing parts from r81960
Modified paths:	/branches/REL1_17/phase3 (modified) (history) /branches/REL1_17/phase3/includes/LocalisationCache.php (modified) (history) /branches/REL1_17/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: branches/REL1_17/phase3/includes/LocalisationCache.php
—	—	@@ -101,7 +101,7 @@
102	102	* by a fallback sequence.
103	103	*/
104	104	static public $mergeableMapKeys = array( 'messages', 'namespaceNames', 'mathNames',
105		~~- 'dateFormats', 'defaultUserOptionOverrides', 'magicWords', 'imageFiles',~~
	105	+ 'dateFormats', 'defaultUserOptionOverrides', 'imageFiles',
106	106	'preloadedMessages',
107	107	);
108	108
—	—	@@ -122,6 +122,11 @@
123	123	* key is removed after the first merge.
124	124	*/
125	125	static public $optionalMergeKeys = array( 'bookstoreList' );
	126	+
	127	+ /**
	128	+ * Keys for items that are formatted like $magicWords
	129	+ */
	130	+ static public $magicWordKeys = array( 'magicWords' );
126	131
127	132	/**
128	133	* Keys for items where the subitems are stored in the backend separately.
—	—	@@ -187,7 +192,8 @@
188	193	self::$mergeableMapKeys,
189	194	self::$mergeableListKeys,
190	195	self::$mergeableAliasListKeys,
191		~~- self::$optionalMergeKeys~~
	196	+ self::$optionalMergeKeys,
	197	+ self::$magicWordKeys
192	198	) );
193	199	}
194	200	return isset( $this->mergeableKeys[$key] );
—	—	@@ -435,6 +441,8 @@
436	442	if ( isset( $value['inherit'] ) ) {
437	443	unset( $value['inherit'] );
438	444	}
	445	+ } elseif ( in_array( $key, self::$magicWordKeys ) ) {
	446	+ $this->mergeMagicWords( $value, $fallbackValue );
439	447	}
440	448	}
441	449	} else {
Index: branches/REL1_17/phase3/resources/Resources.php
—	—	@@ -12,11 +12,48 @@
13	13	/* Skins */
14	14
15	15	'skins.vector' => array(
16		~~- 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) )~~
	16	+ 'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
	17	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	18	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
17	19	),
	20	+ 'skins.monobook' => array(
	21	+ 'styles' => array(
	22	+ 'monobook/main.css' => array( 'media' => 'screen' ),
	23	+ ),
	24	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	25	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	26	+ ),
18	27	'skins.simple' => array(
19		~~- 'styles' => array( 'skins/simple/main.css' => array( 'media' => 'screen' ) ),~~
	28	+ 'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
	29	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	30	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
20	31	),
	32	+ 'skins.chick' => array(
	33	+ 'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
	34	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	35	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	36	+ ),
	37	+ 'skins.modern' => array(
	38	+ 'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
	39	+ 'modern/print.css' => array( 'media' => 'print' ) ),
	40	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	41	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	42	+ ),
	43	+ 'skins.cologneblue' => array(
	44	+ 'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
	45	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	46	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	47	+ ),
	48	+ 'skins.nostalgia' => array(
	49	+ 'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
	50	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	51	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	52	+ ),
	53	+ 'skins.standard' => array(
	54	+ 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
	55	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	56	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	57	+ ),
21	58
22	59	/* jQuery */
23	60
—	—	@@ -330,9 +367,6 @@
331	368	'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.placeholder' ),
332	369	'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
333	370	),
334		~~- 'mediawiki.util.jpegmeta' => array(~~
335		~~- 'scripts' => 'resources/mediawiki.util/mediawiki.util.jpegmeta.js',~~
336		~~- ),~~
337	371	'mediawiki.action.history' => array(
338	372	'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
339	373	'dependencies' => 'mediawiki.legacy.history',
—	—	@@ -410,7 +444,9 @@
411	445	/* mediawiki Legacy */
412	446
413	447	'mediawiki.legacy.ajax' => array(
414		~~- 'scripts' => 'skins/common/ajax.js',~~
	448	+ 'scripts' => 'common/ajax.js',
	449	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	450	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
415	451	'messages' => array(
416	452	'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch',
417	453	'tooltip-ca-unwatch'
—	—	@@ -422,15 +458,21 @@
423	459	'dependencies' => 'mediawiki.legacy.wikibits',
424	460	),
425	461	'mediawiki.legacy.block' => array(
426		~~- 'scripts' => 'skins/common/block.js',~~
	462	+ 'scripts' => 'common/block.js',
	463	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	464	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
427	465	'dependencies' => 'mediawiki.legacy.wikibits',
428	466	),
429	467	'mediawiki.legacy.commonPrint' => array(
430		~~- 'styles' => array( 'skins/common/commonPrint.css' => array( 'media' => 'print' ) ),~~
	468	+ 'styles' => array( 'common/commonPrint.css' => array( 'media' => 'print' ) ),
	469	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	470	+ 'localBasePath' => "{$GLOBALS['IP']}/skins",
431	471	),
432	472	'mediawiki.legacy.config' => array(
433		~~- 'scripts' => 'skins/common/config.js',~~
434		~~- 'styles' => array( 'skins/common/config.css', 'skins/common/config-cc.css' ),~~
	473	+ 'scripts' => 'common/config.js',
	474	+ 'styles' => array( 'common/config.css', 'common/config-cc.css' ),
	475	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	476	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
435	477	'dependencies' => 'mediawiki.legacy.wikibits',
436	478	),
437	479	'mediawiki.legacy.diff' => array(
—	—	@@ -438,11 +480,13 @@
439	481	'styles' => 'common/diff.css',
440	482	'group' => 'mediawiki.action.history',
441	483	'remoteBasePath' => $GLOBALS['wgStylePath'],
442		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins",~~
	484	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
443	485	'dependencies' => 'mediawiki.legacy.wikibits',
444	486	),
445	487	'mediawiki.legacy.edit' => array(
446		~~- 'scripts' => 'skins/common/edit.js',~~
	488	+ 'scripts' => 'common/edit.js',
	489	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	490	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
447	491	'dependencies' => 'mediawiki.legacy.wikibits',
448	492	),
449	493	'mediawiki.legacy.enhancedchanges' => array(
—	—	@@ -453,60 +497,93 @@
454	498	'scripts' => 'common/history.js',
455	499	'group' => 'mediawiki.action.history',
456	500	'remoteBasePath' => $GLOBALS['wgStylePath'],
457		~~- 'localBasePath' => "{$GLOBALS['IP']}/skins",~~
	501	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
458	502	'dependencies' => 'mediawiki.legacy.wikibits',
459	503	),
460	504	'mediawiki.legacy.htmlform' => array(
461		~~- 'scripts' => 'skins/common/htmlform.js',~~
	505	+ 'scripts' => 'common/htmlform.js',
	506	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	507	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
462	508	'dependencies' => 'mediawiki.legacy.wikibits',
463	509	),
464	510	'mediawiki.legacy.IEFixes' => array(
465		~~- 'scripts' => 'skins/common/IEFixes.js',~~
	511	+ 'scripts' => 'common/IEFixes.js',
	512	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	513	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
466	514	'dependencies' => 'mediawiki.legacy.wikibits',
467	515	),
468	516	'mediawiki.legacy.metadata' => array(
469		~~- 'scripts' => 'skins/common/metadata.js',~~
	517	+ 'scripts' => 'common/metadata.js',
	518	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	519	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
470	520	'dependencies' => 'mediawiki.legacy.wikibits',
471	521	'messages' => array( 'metadata-expand', 'metadata-collapse' ),
472	522	),
473	523	'mediawiki.legacy.mwsuggest' => array(
474		~~- 'scripts' => 'skins/common/mwsuggest.js',~~
	524	+ 'scripts' => 'common/mwsuggest.js',
	525	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	526	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
475	527	'dependencies' => 'mediawiki.legacy.wikibits',
476	528	'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
477	529	),
	530	+ 'mediawiki.legacy.password' => array(
	531	+ 'scripts' => 'common/password.js',
	532	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	533	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	534	+ 'styles' => 'common/password.css',
	535	+ 'dependencies' => 'mediawiki.legacy.wikibits',
	536	+ ),
478	537	'mediawiki.legacy.prefs' => array(
479		~~- 'scripts' => 'skins/common/prefs.js',~~
	538	+ 'scripts' => 'common/prefs.js',
	539	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	540	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
480	541	'dependencies' => array( 'mediawiki.legacy.wikibits', 'mediawiki.legacy.htmlform' ),
481	542	),
482	543	'mediawiki.legacy.preview' => array(
483		~~- 'scripts' => 'skins/common/preview.js',~~
	544	+ 'scripts' => 'common/preview.js',
	545	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	546	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
484	547	'dependencies' => 'mediawiki.legacy.wikibits',
485	548	),
486	549	'mediawiki.legacy.protect' => array(
487		~~- 'scripts' => 'skins/common/protect.js',~~
	550	+ 'scripts' => 'common/protect.js',
	551	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	552	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
488	553	'dependencies' => 'mediawiki.legacy.wikibits',
489	554	),
490	555	'mediawiki.legacy.search' => array(
491		~~- 'scripts' => 'skins/common/search.js',~~
492		~~- 'styles' => 'skins/common/search.css',~~
	556	+ 'scripts' => 'common/search.js',
	557	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	558	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
	559	+ 'styles' => 'common/search.css',
493	560	'dependencies' => 'mediawiki.legacy.wikibits',
494	561	),
495	562	'mediawiki.legacy.shared' => array(
496		~~- 'styles' => array( 'skins/common/shared.css' => array( 'media' => 'screen' ) ),~~
	563	+ 'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
	564	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	565	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
497	566	),
498	567	'mediawiki.legacy.oldshared' => array(
499		~~- 'styles' => array( 'skins/common/oldshared.css' => array( 'media' => 'screen' ) ),~~
	568	+ 'styles' => array( 'common/oldshared.css' => array( 'media' => 'screen' ) ),
	569	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	570	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
500	571	),
501	572	'mediawiki.legacy.upload' => array(
502		~~- 'scripts' => 'skins/common/upload.js',~~
	573	+ 'scripts' => 'common/upload.js',
	574	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	575	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
503	576	'dependencies' => 'mediawiki.legacy.wikibits',
504	577	),
505	578	'mediawiki.legacy.wikibits' => array(
506		~~- 'scripts' => 'skins/common/wikibits.js',~~
	579	+ 'scripts' => 'common/wikibits.js',
	580	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	581	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
507	582	'dependencies' => 'mediawiki.language',
508	583	'messages' => array( 'showtoc', 'hidetoc' ),
509	584	),
510	585	'mediawiki.legacy.wikiprintable' => array(
511		~~- 'styles' => array( 'skins/common/wikiprintable.css' => array( 'media' => 'print' ) ),~~
	586	+ 'styles' => array( 'common/wikiprintable.css' => array( 'media' => 'print' ) ),
	587	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	588	+ 'localBasePath' => "{$GLOBALS['IP']}/skins"
512	589	),
513	590	);
Property changes on: branches/REL1_17/phase3/resources/Resources.php
___________________________________________________________________
Modified: svn:mergeinfo
514	591	Merged /trunk/phase3/resources/Resources.php:r81719,81722,82200,82721
Property changes on: branches/REL1_17/phase3
___________________________________________________________________
Modified: svn:mergeinfo
515	592	Merged /trunk/phase3:r81719,81722,82200,82721

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
r81721	Fix r81719: trailing commas	catrope	12:13, 8 February 2011
r81722	Fix double commas from r81721. This time I actually ran it through php -l bef...	catrope	12:14, 8 February 2011
r81960	Since 1.17 a whole lot of extensions have sprouted *.i18n.magic.php files. Mo...	tstarling	11:53, 11 February 2011
r82200	Grouped diff and history modules together to help reduce cache invalidation. ...	tparscal	22:14, 15 February 2011
r85151	MFT: r82000, r82004, r82020, r82025, r82038, r82039, r82048, r82070, r82081, ...	demon	20:39, 1 April 2011

Status & tagging log

09:53, 20 April 2011 Catrope (talk | contribs) changed the status of r85348 [removed: new added: ok]