r57531 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r57530‎ \| r57531 \| r57532 >
Date:	19:57, 8 October 2009
Author:	werdna
Status:	ok
Tags:
Comment:	Merge r57530
Modified paths:	/branches/wmf-deployment/includes (modified) (history) /branches/wmf-deployment/includes/ConfEditor.php (modified) (history) /branches/wmf-deployment/includes/EditPage.php (modified) (history) /branches/wmf-deployment/includes/HTMLForm.php (modified) (history) /branches/wmf-deployment/includes/HistoryPage.php (modified) (history) /branches/wmf-deployment/includes/Linker.php (modified) (history) /branches/wmf-deployment/includes/OutputPage.php (modified) (history) /branches/wmf-deployment/includes/Revision.php (modified) (history) /branches/wmf-deployment/includes/Skin.php (modified) (history) /branches/wmf-deployment/includes/Title.php (modified) (history) /branches/wmf-deployment/includes/Xml.php (modified) (history) /branches/wmf-deployment/includes/api/ApiMain.php (modified) (history) /branches/wmf-deployment/includes/json/Services_JSON.php (modified) (history) /branches/wmf-deployment/includes/specials (modified) (history) /branches/wmf-deployment/includes/specials/SpecialContributions.php (modified) (history) /branches/wmf-deployment/includes/specials/SpecialUpload.php (modified) (history) /branches/wmf-deployment/includes/specials/SpecialUserrights.php (modified) (history) /branches/wmf-deployment/includes/upload/UploadBase.php (modified) (history)

Diff [purge]

Property changes on: branches/wmf-deployment/includes/upload/UploadBase.php
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /branches/REL1_15/phase3/includes/upload/UploadBase.php:51646
/branches/wmf-deployment/includes/upload/UploadBase.php:53381
/trunk/phase3/includes/upload/UploadBase.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56416,56618,56631,56817,57154-57447
2	2	+ /branches/REL1_15/phase3/includes/upload/UploadBase.php:51646
/branches/wmf-deployment/includes/upload/UploadBase.php:53381
/trunk/phase3/includes/upload/UploadBase.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56416,56618,56631,56817,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/Xml.php
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /branches/REL1_15/phase3/includes/Xml.php:51646
/branches/wmf-deployment/includes/Xml.php:53381
/trunk/phase3/includes/Xml.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56496,57154-57447
4	4	+ /branches/REL1_15/phase3/includes/Xml.php:51646
/branches/wmf-deployment/includes/Xml.php:53381
/trunk/phase3/includes/Xml.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56496,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/json/Services_JSON.php
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
6	6	+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/Linker.php
___________________________________________________________________
Name: svn:mergeinfo
7	7	- /branches/REL1_15/phase3/includes/Linker.php:51646
/branches/wmf-deployment/includes/Linker.php:53381
/trunk/phase3/includes/Linker.php:56174,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56514,57154-57447
8	8	+ /branches/REL1_15/phase3/includes/Linker.php:51646
/branches/wmf-deployment/includes/Linker.php:53381
/trunk/phase3/includes/Linker.php:56174,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56514,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/EditPage.php
___________________________________________________________________
Name: svn:mergeinfo
9	9	- /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/wmf-deployment/includes/EditPage.php:53381
/trunk/phase3/includes/EditPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56478,57154-57447
10	10	+ /branches/REL1_15/phase3/includes/EditPage.php:51646
/branches/wmf-deployment/includes/EditPage.php:53381
/trunk/phase3/includes/EditPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56478,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/HTMLForm.php
___________________________________________________________________
Name: svn:mergeinfo
11	11	- /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/wmf-deployment/includes/HTMLForm.php:53381
/trunk/phase3/includes/HTMLForm.php:56184,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
12	12	+ /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/wmf-deployment/includes/HTMLForm.php:53381
/trunk/phase3/includes/HTMLForm.php:56184,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/OutputPage.php
___________________________________________________________________
Name: svn:mergeinfo
13	13	- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381
/trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472
14	14	+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381
/trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472,57530
Property changes on: branches/wmf-deployment/includes/HistoryPage.php
___________________________________________________________________
Name: svn:mergeinfo
15	15	- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57470
16	16	+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57470,57530
Property changes on: branches/wmf-deployment/includes/api/ApiMain.php
___________________________________________________________________
Name: svn:mergeinfo
17	17	- /branches/REL1_15/phase3/includes/api/ApiMain.php:51646
/branches/wmf-deployment/includes/api/ApiMain.php:53381
/trunk/phase3/includes/api/ApiMain.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56531,57154-57447
18	18	+ /branches/REL1_15/phase3/includes/api/ApiMain.php:51646
/branches/wmf-deployment/includes/api/ApiMain.php:53381
/trunk/phase3/includes/api/ApiMain.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56531,57154-57447,57530
Index: branches/wmf-deployment/includes/Revision.php
—	—	@@ -979,9 +979,16 @@
980	980	public function userCan( $field ) {
981	981	if( $this->mDeleted & $field ) {
982	982	global $wgUser;
983		~~- $permission = ( $this->mDeleted & self::DELETED_RESTRICTED )~~
984		~~- ? 'suppressrevision'~~
985		~~- : ( $field & self::DELETED_TEXT ) ? 'deletedtext' : 'deletedhistory';~~
	983	+
	984	+ $permission = '';
	985	+ if ( $this->mDeleted & self::DELETED_RESTRICTED ) {
	986	+ $permission = 'suppressrevision';
	987	+ } elseif ( $field & self::DELETED_TEXT ) {
	988	+ $permission = 'deletedtext';
	989	+ } else {
	990	+ $permission = 'deletedhistory';
	991	+ }
	992	+
986	993	wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" );
987	994	return $wgUser->isAllowed( $permission );
988	995	} else {
Property changes on: branches/wmf-deployment/includes/Title.php
___________________________________________________________________
Name: svn:mergeinfo
989	996	- /branches/REL1_15/phase3/includes/Title.php:51646
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56492,56918,57154-57447
990	997	+ /branches/REL1_15/phase3/includes/Title.php:51646
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56492,56918,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
991	998	- /trunk/phase3/includes/ConfEditor.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
992	999	+ /trunk/phase3/includes/ConfEditor.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php
___________________________________________________________________
Name: svn:mergeinfo
993	1000	- /branches/REL1_15/phase3/includes/specials/SpecialUserrights.php:51646
/branches/wmf-deployment/includes/specials/SpecialUserrights.php:53381
/trunk/phase3/includes/specials/SpecialUserrights.php:56188,57064,57154-57447
994	1001	+ /branches/REL1_15/phase3/includes/specials/SpecialUserrights.php:51646
/branches/wmf-deployment/includes/specials/SpecialUserrights.php:53381
/trunk/phase3/includes/specials/SpecialUserrights.php:56188,57064,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/specials/SpecialContributions.php
___________________________________________________________________
Name: svn:mergeinfo
995	1002	- /branches/REL1_15/phase3/includes/specials/SpecialContributions.php:51646
/branches/wmf-deployment/includes/specials/SpecialContributions.php:53381
/trunk/phase3/includes/specials/SpecialContributions.php:56188,56468,57154-57447,57478,57489
996	1003	+ /branches/REL1_15/phase3/includes/specials/SpecialContributions.php:51646
/branches/wmf-deployment/includes/specials/SpecialContributions.php:53381
/trunk/phase3/includes/specials/SpecialContributions.php:56188,56468,57154-57447,57478,57489,57530
Property changes on: branches/wmf-deployment/includes/specials/SpecialUpload.php
___________________________________________________________________
Name: svn:mergeinfo
997	1004	- /branches/REL1_15/phase3/includes/specials/SpecialUpload.php:51646
/branches/wmf-deployment/includes/specials/SpecialUpload.php:53381
/trunk/phase3/includes/specials/SpecialUpload.php:56188,56416,56524,57154-57447
998	1005	+ /branches/REL1_15/phase3/includes/specials/SpecialUpload.php:51646
/branches/wmf-deployment/includes/specials/SpecialUpload.php:53381
/trunk/phase3/includes/specials/SpecialUpload.php:56188,56416,56524,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
999	1006	- /branches/REL1_15/phase3/includes/specials:51646
/branches/wmf-deployment/includes/specials:53381
/trunk/phase3/includes/specials:56188,57154-57447
1000	1007	+ /branches/REL1_15/phase3/includes/specials:51646
/branches/wmf-deployment/includes/specials:53381
/trunk/phase3/includes/specials:56188,57154-57447,57530
Property changes on: branches/wmf-deployment/includes/Skin.php
___________________________________________________________________
Name: svn:mergeinfo
1001	1008	- /branches/REL1_15/phase3/includes/Skin.php:51646
/branches/wmf-deployment/includes/Skin.php:53381
/trunk/phase3/includes/Skin.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56523,57154-57447
1002	1009	+ /branches/REL1_15/phase3/includes/Skin.php:51646
/branches/wmf-deployment/includes/Skin.php:53381
/trunk/phase3/includes/Skin.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56523,57154-57447,57530
Property changes on: branches/wmf-deployment/includes
___________________________________________________________________
Name: svn:mergeinfo
1003	1010	- /branches/REL1_15/phase3/includes:51646
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447
1004	1011	+ /branches/REL1_15/phase3/includes:51646
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r57530	Replace broken nested terneries (causing a nasty bug where all admins could v...	werdna	19:40, 8 October 2009

Status & tagging log

04:00, 15 December 2009 Tim Starling (talk | contribs) changed the status of r57531 [removed: new added: ok]