http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100201
Revision: 100201
Author: reedy
Date: 2011-10-19 01:35:26 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
1.18wmf1 MFT r100200
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/Contest/includes/Contest.class.php
Property Changed:
----------------
branches/wmf/1.18wmf1/extensions/Contest/
Property changes on: branches/wmf/1.18wmf1/extensions/Contest
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/Contest:51646
/branches/REL1_17/phase3/extensions/Contest:81445,81448
/branches/new-installer/phase3/extensions/Contest:43664-66004
/branches/sqlite/extensions/Contest:58211-58321
/trunk/extensions/Contest:99592,99653,100190-100191,100193,100198
/trunk/phase3/extensions/Contest:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
+ /branches/REL1_15/phase3/extensions/Contest:51646
/branches/REL1_17/phase3/extensions/Contest:81445,81448
/branches/new-installer/phase3/extensions/Contest:43664-66004
/branches/sqlite/extensions/Contest:58211-58321
/trunk/extensions/Contest:99592,99653,100190-100191,100193,100198,100200
/trunk/phase3/extensions/Contest:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
Modified: branches/wmf/1.18wmf1/extensions/Contest/includes/Contest.class.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Contest/includes/Contest.class.php
2011-10-19 01:30:15 UTC (rev 100200)
+++ branches/wmf/1.18wmf1/extensions/Contest/includes/Contest.class.php
2011-10-19 01:35:26 UTC (rev 100201)
@@ -137,17 +137,18 @@
* @return array
*/
public function getDefaults() {
+ $defaultPage = 'MediaWiki:Contests/';
return array(
'name' => '',
'status' => self::STATUS_DRAFT,
'end' => '',
- 'rules_page' => 'MediaWiki:Contests/',
- 'opportunities' => 'MediaWiki:Contests/',
- 'intro' => 'MediaWiki:Contests/',
- 'help' => '',
- 'signup_email' => 'MediaWiki:Contests/',
- 'reminder_email' => 'MediaWiki:Contests/',
+ 'rules_page' => $defaultPage,
+ 'opportunities' => $defaultPage,
+ 'intro' => $defaultPage,
+ 'help' => $defaultPage,
+ 'signup_email' => $defaultPage,
+ 'reminder_email' => $defaultPage,
'submission_count' => 0,
);
@@ -189,11 +190,11 @@
wfMsg( 'contest-status-finished' ) =>
self::STATUS_FINISHED,
);
}
-
+
if ( !$onlySettable ) {
$map[wfMsg( 'contest-status-expired')] =
self::STATUS_EXPIRED;
- }
-
+ }
+
return $map;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs