r64845 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r64844‎ \| r64845 \| r64846 >
Date:	02:43, 10 April 2010
Author:	tstarling
Status:	reverted
Tags:
Comment:	MFT r64844: Swapped the order of the "diff" and "hist" links on Special:Contributions to match the 1.15 behaviour.
Modified paths:	/branches/wmf/1.16wmf4/includes (modified) (history) /branches/wmf/1.16wmf4/includes/ChangesList.php (modified) (history) /branches/wmf/1.16wmf4/includes/ConfEditor.php (modified) (history) /branches/wmf/1.16wmf4/includes/DefaultSettings.php (modified) (history) /branches/wmf/1.16wmf4/includes/HistoryPage.php (modified) (history) /branches/wmf/1.16wmf4/includes/LocalisationCache.php (modified) (history) /branches/wmf/1.16wmf4/includes/OutputPage.php (modified) (history) /branches/wmf/1.16wmf4/includes/api (modified) (history) /branches/wmf/1.16wmf4/includes/diff (modified) (history) /branches/wmf/1.16wmf4/includes/json/Services_JSON.php (modified) (history) /branches/wmf/1.16wmf4/includes/media/Bitmap.php (modified) (history) /branches/wmf/1.16wmf4/includes/parser (modified) (history) /branches/wmf/1.16wmf4/includes/specials (modified) (history) /branches/wmf/1.16wmf4/includes/specials/SpecialContributions.php (modified) (history) /branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php (modified) (history)

Diff [purge]

Property changes on: branches/wmf/1.16wmf4/includes/diff
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381,60970
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802
2	2	+ /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381,60970
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802,64844
Property changes on: branches/wmf/1.16wmf4/includes/json/Services_JSON.php
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901
4	4	+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/branches/wmf-deployment/includes/json/Services_JSON.php:60970
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/LocalisationCache.php
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381,60970
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901
6	6	+ /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381,60970
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/parser
___________________________________________________________________
Name: svn:mergeinfo
7	7	- /branches/REL1_15/phase3/includes/parser:51646
/branches/sqlite/includes/parser:58211-58321
/branches/wmf-deployment/includes/parser:53381,60970
/trunk/phase3/includes/parser:63549,63764,63897-63901,64827
8	8	+ /branches/REL1_15/phase3/includes/parser:51646
/branches/sqlite/includes/parser:58211-58321
/branches/wmf-deployment/includes/parser:53381,60970
/trunk/phase3/includes/parser:63549,63764,63897-63901,64827,64844
Property changes on: branches/wmf/1.16wmf4/includes/OutputPage.php
___________________________________________________________________
Name: svn:mergeinfo
9	9	- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468,60970
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901
10	10	+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468,60970
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/HistoryPage.php
___________________________________________________________________
Name: svn:mergeinfo
11	11	- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/wmf-deployment/includes/HistoryPage.php:60970
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901
12	12	+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/wmf-deployment/includes/HistoryPage.php:60970
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/api
___________________________________________________________________
Name: svn:mergeinfo
13	13	- /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901
14	14	+ /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/media/Bitmap.php
___________________________________________________________________
Name: svn:mergeinfo
15	15	- /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692
16	16	+ /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381,60970
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64691-64692,64844
Property changes on: branches/wmf/1.16wmf4/includes/ChangesList.php
___________________________________________________________________
Name: svn:mergeinfo
17	17	- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589,60970
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901
18	18	+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589,60970
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
19	19	- /branches/wmf-deployment/includes/ConfEditor.php:60970
/trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901
20	20	+ /branches/wmf-deployment/includes/ConfEditor.php:60970
/trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php
___________________________________________________________________
Name: svn:mergeinfo
21	21	- /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381,60970
/trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692
22	22	+ /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381,60970
/trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692,64844
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
___________________________________________________________________
Name: svn:mergeinfo
23	23	- /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646
/branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837
24	24	+ /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646
/branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837,64844
Index: branches/wmf/1.16wmf4/includes/specials/SpecialContributions.php
—	—	@@ -640,7 +640,7 @@
641	641	$del = '';
642	642	}
643	643
644		~~- $diffHistLinks = '(' . $difftext . $this->messages['pipe-separator'] . $histlink . ')';~~
	644	+ $diffHistLinks = '(' . $histlink . $this->messages['pipe-separator'] . $difftext . ')';
645	645	$ret = "{$del}{$d} {$diffHistLinks} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
646	646
647	647	# Denote if username is redacted for this edit
Property changes on: branches/wmf/1.16wmf4/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
648	648	- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967,60970
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901
649	649	+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967,60970
/trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64844
Property changes on: branches/wmf/1.16wmf4/includes
___________________________________________________________________
Name: svn:mergeinfo
650	650	- /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901
651	651	+ /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381,60970
/trunk/phase3/includes:63549,63764,63897-63901,64844

Follow-up revisions

Revision	Commit summary	Author	Date
r64848	Revert r64845 pending discussion	tstarling	03:41, 10 April 2010

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r64844	Swapped the order of the "diff" and "hist" links on Special:Contributions to ...	tstarling	02:41, 10 April 2010

Status & tagging log

03:54, 10 April 2010 Tim Starling (talk | contribs) changed the status of r64845 [removed: new added: reverted]